Merge pull request #8712 from Phrohdoh/fix#rename-pwl
Rename ProduceableWithLevel to ProducibleWithLevel.
This commit is contained in:
@@ -481,7 +481,7 @@
|
|||||||
<Compile Include="Traits\TransformOnPassenger.cs" />
|
<Compile Include="Traits\TransformOnPassenger.cs" />
|
||||||
<Compile Include="Traits\Transforms.cs" />
|
<Compile Include="Traits\Transforms.cs" />
|
||||||
<Compile Include="Traits\Turreted.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\DeployToUpgrade.cs" />
|
||||||
<Compile Include="Traits\Upgrades\DisableUpgrade.cs" />
|
<Compile Include="Traits\Upgrades\DisableUpgrade.cs" />
|
||||||
<Compile Include="Traits\Upgrades\UpgradableTrait.cs" />
|
<Compile Include="Traits\Upgrades\UpgradableTrait.cs" />
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace OpenRA.Mods.Common.Traits
|
|||||||
[Desc("Actors possessing this trait should define the GainsExperience trait. When the prerequisites are fulfilled, ",
|
[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 ",
|
"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.")]
|
"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 = { };
|
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?")]
|
[Desc("Should the level-up animation be suppressed when actor is created?")]
|
||||||
public readonly bool SuppressLevelupAnimation = true;
|
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;
|
this.info = info;
|
||||||
}
|
}
|
||||||
@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
|
|||||||
|
|
||||||
foreach (var a in self.World.Map.Rules.Actors.Values)
|
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)
|
if (uwc != null)
|
||||||
ttc.Add(MakeKey(a.Name), uwc.Prerequisites, 0, this);
|
ttc.Add(MakeKey(a.Name), uwc.Prerequisites, 0, this);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ MIG:
|
|||||||
SmokeTrailWhenDamaged:
|
SmokeTrailWhenDamaged:
|
||||||
Offset: -853,0,171
|
Offset: -853,0,171
|
||||||
Interval: 2
|
Interval: 2
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: aircraft.upgraded
|
Prerequisites: aircraft.upgraded
|
||||||
|
|
||||||
YAK:
|
YAK:
|
||||||
@@ -180,7 +180,7 @@ YAK:
|
|||||||
SmokeTrailWhenDamaged:
|
SmokeTrailWhenDamaged:
|
||||||
Offset: -853,0,0
|
Offset: -853,0,0
|
||||||
Interval: 2
|
Interval: 2
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: aircraft.upgraded
|
Prerequisites: aircraft.upgraded
|
||||||
|
|
||||||
TRAN:
|
TRAN:
|
||||||
@@ -269,7 +269,7 @@ HELI:
|
|||||||
HuskActor: HELI.Husk
|
HuskActor: HELI.Husk
|
||||||
SmokeTrailWhenDamaged:
|
SmokeTrailWhenDamaged:
|
||||||
Offset: -427,0,0
|
Offset: -427,0,0
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: aircraft.upgraded
|
Prerequisites: aircraft.upgraded
|
||||||
|
|
||||||
HIND:
|
HIND:
|
||||||
@@ -323,7 +323,7 @@ HIND:
|
|||||||
HuskActor: HIND.Husk
|
HuskActor: HIND.Husk
|
||||||
SmokeTrailWhenDamaged:
|
SmokeTrailWhenDamaged:
|
||||||
Offset: -427,0,0
|
Offset: -427,0,0
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: aircraft.upgraded
|
Prerequisites: aircraft.upgraded
|
||||||
|
|
||||||
U2:
|
U2:
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ E1:
|
|||||||
AttackFrontal:
|
AttackFrontal:
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
E2:
|
E2:
|
||||||
@@ -100,7 +100,7 @@ E2:
|
|||||||
Explodes:
|
Explodes:
|
||||||
Weapon: UnitExplodeSmall
|
Weapon: UnitExplodeSmall
|
||||||
Chance: 50
|
Chance: 50
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
E3:
|
E3:
|
||||||
@@ -129,7 +129,7 @@ E3:
|
|||||||
AttackFrontal:
|
AttackFrontal:
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
E4:
|
E4:
|
||||||
@@ -156,7 +156,7 @@ E4:
|
|||||||
AttackFrontal:
|
AttackFrontal:
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
E6:
|
E6:
|
||||||
@@ -286,7 +286,7 @@ E7:
|
|||||||
AnnounceOnKill:
|
AnnounceOnKill:
|
||||||
Voiced:
|
Voiced:
|
||||||
VoiceSet: TanyaVoice
|
VoiceSet: TanyaVoice
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
MEDI:
|
MEDI:
|
||||||
@@ -487,7 +487,7 @@ SHOK:
|
|||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
Voiced:
|
Voiced:
|
||||||
VoiceSet: ShokVoice
|
VoiceSet: ShokVoice
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
SNIPER:
|
SNIPER:
|
||||||
@@ -528,7 +528,7 @@ SNIPER:
|
|||||||
DetectCloaked:
|
DetectCloaked:
|
||||||
Range: 6
|
Range: 6
|
||||||
-MustBeDestroyed:
|
-MustBeDestroyed:
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
Zombie:
|
Zombie:
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ V2RL:
|
|||||||
WithAttackAnimation:
|
WithAttackAnimation:
|
||||||
AimSequence: aim
|
AimSequence: aim
|
||||||
ReloadPrefix: empty-
|
ReloadPrefix: empty-
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
1TNK:
|
1TNK:
|
||||||
@@ -69,7 +69,7 @@ V2RL:
|
|||||||
EmptyWeapon: UnitExplodeSmall
|
EmptyWeapon: UnitExplodeSmall
|
||||||
LeavesHusk:
|
LeavesHusk:
|
||||||
HuskActor: 1TNK.Husk
|
HuskActor: 1TNK.Husk
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
2TNK:
|
2TNK:
|
||||||
@@ -111,7 +111,7 @@ V2RL:
|
|||||||
HuskActor: 2TNK.Husk
|
HuskActor: 2TNK.Husk
|
||||||
SelectionDecorations:
|
SelectionDecorations:
|
||||||
VisualBounds: 28,28
|
VisualBounds: 28,28
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
3TNK:
|
3TNK:
|
||||||
@@ -153,7 +153,7 @@ V2RL:
|
|||||||
HuskActor: 3TNK.Husk
|
HuskActor: 3TNK.Husk
|
||||||
SelectionDecorations:
|
SelectionDecorations:
|
||||||
VisualBounds: 28,28
|
VisualBounds: 28,28
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
4TNK:
|
4TNK:
|
||||||
@@ -209,7 +209,7 @@ V2RL:
|
|||||||
DamageCooldown: 150
|
DamageCooldown: 150
|
||||||
SelectionDecorations:
|
SelectionDecorations:
|
||||||
VisualBounds: 44,38,0,-4
|
VisualBounds: 44,38,0,-4
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
ARTY:
|
ARTY:
|
||||||
@@ -242,7 +242,7 @@ ARTY:
|
|||||||
Weapon: UnitExplode
|
Weapon: UnitExplode
|
||||||
Chance: 75
|
Chance: 75
|
||||||
AutoTarget:
|
AutoTarget:
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
HARV:
|
HARV:
|
||||||
@@ -366,7 +366,7 @@ JEEP:
|
|||||||
Types: Infantry
|
Types: Infantry
|
||||||
MaxWeight: 1
|
MaxWeight: 1
|
||||||
PipCount: 1
|
PipCount: 1
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
APC:
|
APC:
|
||||||
@@ -400,7 +400,7 @@ APC:
|
|||||||
Types: Infantry
|
Types: Infantry
|
||||||
MaxWeight: 5
|
MaxWeight: 5
|
||||||
PipCount: 5
|
PipCount: 5
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
MNLY.AP:
|
MNLY.AP:
|
||||||
@@ -585,7 +585,7 @@ TTNK:
|
|||||||
SelectionDecorations:
|
SelectionDecorations:
|
||||||
VisualBounds: 30,30
|
VisualBounds: 30,30
|
||||||
AutoTarget:
|
AutoTarget:
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
FTRK:
|
FTRK:
|
||||||
@@ -622,7 +622,7 @@ FTRK:
|
|||||||
AutoTarget:
|
AutoTarget:
|
||||||
SelectionDecorations:
|
SelectionDecorations:
|
||||||
VisualBounds: 28,28
|
VisualBounds: 28,28
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
DTRK:
|
DTRK:
|
||||||
@@ -688,7 +688,7 @@ CTNK:
|
|||||||
LocalYaw: -100
|
LocalYaw: -100
|
||||||
AttackFrontal:
|
AttackFrontal:
|
||||||
PortableChrono:
|
PortableChrono:
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
QTNK:
|
QTNK:
|
||||||
@@ -759,6 +759,6 @@ STNK:
|
|||||||
DetectCloaked:
|
DetectCloaked:
|
||||||
Range: 6
|
Range: 6
|
||||||
-MustBeDestroyed:
|
-MustBeDestroyed:
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: vehicles.upgraded
|
Prerequisites: vehicles.upgraded
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ UMAGON:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
CHAMSPY:
|
CHAMSPY:
|
||||||
@@ -98,7 +98,7 @@ MUTANT:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
MWMN:
|
MWMN:
|
||||||
@@ -123,7 +123,7 @@ MWMN:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
MUTANT3:
|
MUTANT3:
|
||||||
@@ -148,7 +148,7 @@ MUTANT3:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
TRATOS:
|
TRATOS:
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ E2:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: throw
|
AttackSequence: throw
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
MEDIC:
|
MEDIC:
|
||||||
@@ -83,7 +83,7 @@ JUMPJET:
|
|||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
-TakeCover:
|
-TakeCover:
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
GHOST:
|
GHOST:
|
||||||
@@ -121,6 +121,6 @@ GHOST:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ E3:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
CYBORG:
|
CYBORG:
|
||||||
@@ -55,7 +55,7 @@ CYBORG:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
SelectionDecorations:
|
SelectionDecorations:
|
||||||
VisualBounds: 16,31,0,-10
|
VisualBounds: 16,31,0,-10
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
CYC2:
|
CYC2:
|
||||||
@@ -90,7 +90,7 @@ CYC2:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
SelectionDecorations:
|
SelectionDecorations:
|
||||||
VisualBounds: 16,32,-1,-12
|
VisualBounds: 16,32,-1,-12
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
MHIJACK:
|
MHIJACK:
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ E1:
|
|||||||
Voice: Attack
|
Voice: Attack
|
||||||
WithInfantryBody:
|
WithInfantryBody:
|
||||||
AttackSequence: shoot
|
AttackSequence: shoot
|
||||||
ProduceableWithLevel:
|
ProducibleWithLevel:
|
||||||
Prerequisites: barracks.upgraded
|
Prerequisites: barracks.upgraded
|
||||||
|
|
||||||
ENGINEER:
|
ENGINEER:
|
||||||
|
|||||||
Reference in New Issue
Block a user