merge zedternal reborn upstream

CustomZeds/Classes/WMPawn_ZedClot_Slasher_Omega.uc

@@ -8,7 +8,7 @@ var const float ExtraAfflictionResistance, ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Slasher Omega";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.OmegaString;
 }
 
 simulated function PostBeginPlay()
@@ -99,7 +99,6 @@ defaultproperties
 {
 	SlasherOmegaAnimSet=AnimSet'ZedternalReborn_Zeds.Slasher.Slasher_Clot_Omega_AnimSet'
 	SlasherOmegaAnimInfo=KFPawnAnimInfo'ZedternalReborn_Zeds.Slasher.Slasher_Clot_Omega_AnimGroup'
-	LocalizationKey="WMPawn_ZedSlasher_Omega"
 
 	bVersusZed=False
 	DoshValue=15

CustomZeds/Classes/WMPawn_ZedConstants.uc

@@ -0,0 +1,22 @@
+class WMPawn_ZedConstants extends Object;
+
+var const linearColor OmegaColor;
+var const linearColor OmegaFresnelColor;
+
+var localized string OmegaString;
+var localized string TinyString;
+var localized string MediumString;
+var localized string BigString;
+var localized string HugeString;
+var localized string UltraString;
+var localized string EmperorString;
+var localized string PredatorString;
+var localized string BlueString;
+var localized string GreenString;
+var localized string PinkString;
+
+defaultproperties
+{
+	OmegaColor=(R=0.5f,G=0.25f,B=1.0f)
+	OmegaFresnelColor=(R=0.4f,G=0.25f,B=0.7f)
+}

CustomZeds/Classes/WMPawn_ZedCrawler_Big.uc

@@ -4,7 +4,7 @@ var const float ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Big Crawler";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.BigString @ super.GetLocalizedName();
 }
 
 simulated function PostBeginPlay()

CustomZeds/Classes/WMPawn_ZedCrawler_Huge.uc

@@ -4,7 +4,7 @@ var const float ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Huge Crawler";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.HugeString @ super.GetLocalizedName();
 }
 
 simulated function PostBeginPlay()

CustomZeds/Classes/WMPawn_ZedCrawler_Medium.uc

@@ -2,7 +2,7 @@ class WMPawn_ZedCrawler_Medium extends WMPawn_ZedCrawler_NoElite;
 
 static function string GetLocalizedName()
 {
-	return "Medium Crawler";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.MediumString @ super.GetLocalizedName();
 }
 
 simulated function PostBeginPlay()

CustomZeds/Classes/WMPawn_ZedCrawler_Mini.uc

@@ -2,7 +2,7 @@ class WMPawn_ZedCrawler_Mini extends WMPawn_ZedCrawler_NoElite;
 
 static function string GetLocalizedName()
 {
-	return "Baby Crawler";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.TinyString @ super.GetLocalizedName();
 }
 
 simulated function PostBeginPlay()

CustomZeds/Classes/WMPawn_ZedCrawler_Ultra.uc

@@ -4,7 +4,7 @@ var const float ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Ultra Crawler";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.UltraString @ super.GetLocalizedName();
 }
 
 simulated function PostBeginPlay()

CustomZeds/Classes/WMPawn_ZedFleshpound_Omega.uc

@@ -15,7 +15,7 @@ var const float ExtraAfflictionResistance, ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Fleshpound Omega";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.OmegaString;
 }
 
 simulated function PostBeginPlay()
@@ -177,7 +177,6 @@ defaultproperties
 	AltRallyEffectBoneNames(1)="FX_EYE_R"
 	RallyEffectOffset=(X=0.0f,Y=0.0f,Z=0.0f)
 	AltRallyEffectOffset=(X=0.0f,Y=0.0f,Z=0.0f)
-	LocalizationKey="WMPawn_ZedFleshpound_Omega"
 
 	DefaultGlowColor=(G=0.25f)
 	FootstepCameraShakeInnerRadius=230.0f
@@ -198,6 +197,10 @@ defaultproperties
 		MomentumTransfer=65000.0f
 	End Object
 
+	Begin Object Name=PointLightComponent1
+		LightColor=(R=127,G=63,B=255,A=255)
+	End Object
+
 	XPValues(0)=70
 	XPValues(1)=94
 	XPValues(2)=126

CustomZeds/Classes/WMPawn_ZedFleshpound_Predator.uc

@@ -4,7 +4,7 @@ var linearColor PredatorColor;
 
 static function string GetLocalizedName()
 {
-	return "Fleshpound Predator";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.PredatorString;
 }
 
 simulated function PostBeginPlay()
@@ -48,7 +48,7 @@ defaultproperties
 	ControllerClass=Class'CustomZeds.WMAIController_ZedFleshpound_Predator'
 
 	DefaultGlowColor=(G=0.25f)
-	PredatorColor=(R=0.2f,G=1.0f,B=0.1f,A=1.0f)
+	PredatorColor=(R=0.2f,G=1.0f,B=0.1f)
 	FootstepCameraShakeInnerRadius=230.0f
 	FootstepCameraShakeOuterRadius=1035.0f
 
@@ -59,6 +59,10 @@ defaultproperties
 	GroundSpeed=500.0f
 	SprintSpeed=660.0f
 
+	Begin Object Name=PointLightComponent1
+		LightColor=(R=50,G=255,B=25,A=255)
+	End Object
+
 	XPValues(0)=20
 	XPValues(1)=25
 	XPValues(2)=25

CustomZeds/Classes/WMPawn_ZedGorefast_Omega.uc

@@ -16,7 +16,7 @@ replication
 
 static function string GetLocalizedName()
 {
-	return "Gorefast Omega";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.OmegaString;
 }
 
 simulated function PostBeginPlay()
@@ -158,7 +158,6 @@ defaultproperties
 	ShieldImpactEffects=KFSkinTypeEffects_InvulnerabilityShield'KFGameContent.Default__KFPawn_ZedHans:ShieldEffects'
 	ControllerClass=class'CustomZeds.WMAIController_ZedGorefast_Omega'
 	DifficultySettings=class'CustomZeds.WMDifficulty_Gorefast_Omega'
-	LocalizationKey="WMPawn_ZedGorefast_Omega"
 
 	bShieldOn=False
 	bVersusZed=False

CustomZeds/Classes/WMPawn_ZedHusk_Omega.uc

@@ -9,7 +9,7 @@ var const float ExtraAfflictionResistance, ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Husk Omega";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.OmegaString;
 }
 
 function PossessedBy(Controller C, bool bVehicleTransition)
@@ -197,7 +197,6 @@ defaultproperties
 	SuicideFireballClass=class'CustomZeds.WMProj_Husk_Fireball_Suicide'
 	ControllerClass=class'CustomZeds.WMAIController_ZedHusk_Omega'
 	DifficultySettings=class'CustomZeds.WMDifficulty_Husk_Omega'
-	LocalizationKey="WMPawn_ZedHusk_Omega"
 
 	bVersusZed=False
 	DoshValue=34
@@ -219,6 +218,18 @@ defaultproperties
 		SpecialMoveClasses(SM_Custom1) = class'CustomZeds.WMSM_Husk_Omega_FireBallBarrageAttack'
 	End Object
 
+	Begin Object Name=ChestLightComponent0
+		LightColor=(R=127,G=63,B=255,A=255)
+	End Object
+
+	Begin Object Name=ExplosionPointLight
+		LightColor=(R=127,G=63,B=255,A=255)
+	End Object
+
+	Begin Object Name=ExploTemplate0
+		ExploLight=ExplosionPointLight
+	End Object
+
 	XPValues(0)=30
 	XPValues(1)=40
 	XPValues(2)=54

CustomZeds/Classes/WMPawn_ZedHusk_Tiny.uc

@@ -4,7 +4,7 @@ var linearColor glowColor;
 
 static function string GetLocalizedName()
 {
-	return "Tiny Husk";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.TinyString @ super.GetLocalizedName();
 }
 
 function PossessedBy(Controller C, bool bVehicleTransition)
@@ -30,7 +30,7 @@ simulated function UpdateGameplayMICParams()
 
 	super.UpdateGameplayMICParams();
 
-	if(WorldInfo.NetMode != NM_DedicatedServer)
+	if (WorldInfo.NetMode != NM_DedicatedServer)
 	{
 		for (i = 0; i < CharacterMICs.length; ++i)
 		{

CustomZeds/Classes/WMPawn_ZedHusk_Tiny_Blue.uc

@@ -2,15 +2,19 @@ class WMPawn_ZedHusk_Tiny_Blue extends WMPawn_ZedHusk_Tiny;
 
 static function string GetLocalizedName()
 {
-	return "Blue Tiny Husk";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.BlueString @ super.GetLocalizedName();
 }
 
 defaultproperties
 {
-	glowColor=(R=0.6f, G=2.5f, B=5.0f)
+	glowColor=(R=0.12f, G=0.5f, B=1.0f)
+
+	Begin Object Name=ChestLightComponent0
+		LightColor=(R=30, G=127, B=255, A=255)
+	End Object
 
 	Begin Object Class=PointLightComponent Name=ExplosionPointLightBlue
-		LightColor=(R=31, G=128, B=255, A=255)
+		LightColor=(R=30, G=127, B=255, A=255)
 		bCastPerObjectShadows=False
 	End Object
 

CustomZeds/Classes/WMPawn_ZedHusk_Tiny_Green.uc

@@ -2,15 +2,19 @@ class WMPawn_ZedHusk_Tiny_Green extends WMPawn_ZedHusk_Tiny;
 
 static function string GetLocalizedName()
 {
-	return "Green Tiny Husk";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.GreenString @ super.GetLocalizedName();
 }
 
 defaultproperties
 {
-	glowColor=(R=0.6f, G=5.0f, B=0.6f)
+	glowColor=(R=0.12f, G=1.0f, B=0.12f)
+
+	Begin Object Name=ChestLightComponent0
+		LightColor=(R=30, G=255, B=30, A=255)
+	End Object
 
 	Begin Object Class=PointLightComponent Name=ExplosionPointLightGreen
-		LightColor=(R=31, G=255, B=31, A=255)
+		LightColor=(R=30, G=255, B=30, A=255)
 		bCastPerObjectShadows=False
 	End Object
 

CustomZeds/Classes/WMPawn_ZedHusk_Tiny_Pink.uc

@@ -2,15 +2,19 @@ class WMPawn_ZedHusk_Tiny_Pink extends WMPawn_ZedHusk_Tiny;
 
 static function string GetLocalizedName()
 {
-	return "Pink Tiny Husk";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.PinkString @ super.GetLocalizedName();
 }
 
 defaultproperties
 {
-	glowColor=(R=5.0f, G=0.6f, B=1.8f)
+	glowColor=(R=1.0f, G=0.12f, B=0.36f)
+
+	Begin Object Name=ChestLightComponent0
+		LightColor=(R=255, G=30, B=91, A=255)
+	End Object
 
 	Begin Object Class=PointLightComponent Name=ExplosionPointLightPink
-		LightColor=(R=255, G=31, B=92, A=255)
+		LightColor=(R=255, G=30, B=91, A=255)
 		bCastPerObjectShadows=False
 	End Object
 

CustomZeds/Classes/WMPawn_ZedScrake_Emperor.uc

@@ -5,7 +5,7 @@ var const KFPawnAnimInfo ScrakeOmegaAnimInfo;
 
 static function string GetLocalizedName()
 {
-	return "Scrake Emperor";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.EmperorString;
 }
 
 simulated function PostBeginPlay()
@@ -29,7 +29,6 @@ defaultproperties
 	ScrakeOmegaAnimSet=AnimSet'ZedternalReborn_Zeds.Scrake.Scrake_Omega_AnimSet'
 	ScrakeOmegaAnimInfo=KFPawnAnimInfo'ZedternalReborn_Zeds.Scrake.Scrake_Omega_AnimGroup'
 	DifficultySettings=class'CustomZeds.WMDifficulty_Scrake_Emperor'
-	LocalizationKey="WMPawn_ZedScrake_Emperor"
 
 	RageHealthThresholdNormal=0.2f
 	RageHealthThresholdHard=0.225f

CustomZeds/Classes/WMPawn_ZedScrake_Omega.uc

@@ -8,7 +8,7 @@ var const float ExtraAfflictionResistance, ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Scrake Omega";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.OmegaString;
 }
 
 simulated function PostBeginPlay()
@@ -142,7 +142,6 @@ defaultproperties
 {
 	ScrakeOmegaAnimSet=AnimSet'ZedternalReborn_Zeds.Scrake.Scrake_Omega_AnimSet'
 	ScrakeOmegaAnimInfo=KFPawnAnimInfo'ZedternalReborn_Zeds.Scrake.Scrake_Omega_AnimGroup'
-	LocalizationKey="WMPawn_ZedScrake_Omega"
 
 	RageHealthThresholdNormal=0.6f
 	RageHealthThresholdHard=0.7f

CustomZeds/Classes/WMPawn_ZedScrake_Tiny.uc

@@ -6,7 +6,7 @@ var const KFPawnAnimInfo ScrakeTinyAnimInfo;
 
 static function string GetLocalizedName()
 {
-	return "Tiny Scrake";
+	return class'CustomZeds.WMPawn_ZedConstants'.default.TinyString @ super.GetLocalizedName();
 }
 
 simulated function PostBeginPlay()
@@ -70,7 +70,6 @@ defaultproperties
 	ScrakeTinyAnimSet=AnimSet'ZedternalReborn_Zeds.Scrake.Tiny_Scrake_AnimSet'
 	ScrakeOmegaAnimSet=AnimSet'ZedternalReborn_Zeds.Scrake.Scrake_Omega_AnimSet'
 	ScrakeTinyAnimInfo=KFPawnAnimInfo'ZedternalReborn_Zeds.Scrake.Tiny_Scrake_AnimGroup'
-	LocalizationKey="WMPawn_ZedScrake_Omega"
 
 	RageHealthThresholdNormal=0.99f
 	RageHealthThresholdHard=0.99f

CustomZeds/Classes/WMPawn_ZedSiren_Omega.uc

@@ -5,7 +5,7 @@ var const float ExtraAfflictionResistance, ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Siren Omega";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.OmegaString;
 }
 
 simulated function PostBeginPlay()
@@ -111,7 +111,7 @@ defaultproperties
 	ExtraDamageResistance=0.1f
 
 	Begin Object Name=NeckLightComponent0
-		LightColor=(R=255,G=64,B=128,A=255)
+		LightColor=(R=127,G=63,B=255,A=255)
 	End Object
 
 	XPValues(0)=22

CustomZeds/Classes/WMPawn_ZedStalker_Omega.uc

@@ -5,7 +5,7 @@ var const float ExtraAfflictionResistance, ExtraDamageResistance;
 
 static function string GetLocalizedName()
 {
-	return "Stalker Omega";
+	return super.GetLocalizedName() @ class'CustomZeds.WMPawn_ZedConstants'.default.OmegaString;
 }
 
 simulated function PostBeginPlay()