Fix new line symbol issues

2020-04-19 00:44:48 +07:00 · 2020-04-19 00:44:48 +07:00 · d66d86b2b1
commit d66d86b2b1
parent 51bb9add5b
846 changed files with 33896 additions and 12983 deletions
--- a/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceDamTypeThompsonDrum.uc
+++ b/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceDamTypeThompsonDrum.uc
@ -1,5 +1,14 @@
-class NiceDamTypeThompsonDrum extends NiceDamageTypeVetCommando
-    abstract;
-defaultproperties
-{
    HeadShotDamageMult=1.500000
    WeaponClass=Class'NicePack.NiceThompsonDrumSMG'
    DeathString="%k killed %o (Rising Storm Tommy Gun)."
    FemaleSuicide="%o shot herself in the foot."
    MaleSuicide="%o shot himself in the foot."
    bRagdollBullet=True
    KDamageImpulse=1500.000000
    KDeathVel=110.000000
    KDeathUpKick=2.000000
-}
+class NiceDamTypeThompsonDrum extends NiceDamageTypeVetCommando
+    abstract;
+defaultproperties
+{
+    HeadShotDamageMult=1.500000
+    WeaponClass=Class'NicePack.NiceThompsonDrumSMG'
+    DeathString="%k killed %o (Rising Storm Tommy Gun)."
+    FemaleSuicide="%o shot herself in the foot."
+    MaleSuicide="%o shot himself in the foot."
+    bRagdollBullet=True
+    KDamageImpulse=1500.000000
+    KDeathVel=110.000000
+    KDeathUpKick=2.000000
+}
--- a/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumAmmo.uc
+++ b/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumAmmo.uc
@ -1,5 +1,12 @@
-class NiceThompsonDrumAmmo extends NiceAmmo;
-#EXEC OBJ LOAD FILE=KillingFloorHUD.utx
-defaultproperties
-{
    WeaponPickupClass=Class'NicePack.NiceThompsonDrumPickup'
    MaxAmmo=360
    InitialAmount=90
    PickupClass=Class'KFMod.ThompsonDrumAmmoPickup'
    IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
    IconCoords=(X1=336,Y1=82,X2=382,Y2=125)
    ItemName="45. ACP bullets"
-}
+class NiceThompsonDrumAmmo extends NiceAmmo;
+#EXEC OBJ LOAD FILE=KillingFloorHUD.utx
+defaultproperties
+{
+    WeaponPickupClass=Class'NicePack.NiceThompsonDrumPickup'
+    MaxAmmo=360
+    InitialAmount=90
+    PickupClass=Class'KFMod.ThompsonDrumAmmoPickup'
+    IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
+    IconCoords=(X1=336,Y1=82,X2=382,Y2=125)
+    ItemName="45. ACP bullets"
+}
--- a/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumAmmoPickup.uc
+++ b/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumAmmoPickup.uc
@ -1,4 +1,8 @@
-class NiceThompsonDrumAmmoPickup extends NiceAmmoPickup;
-defaultproperties
-{
    AmmoAmount=40
    InventoryType=Class'NicePack.NiceThompsonDrumAmmo'
    PickupMessage="Rounds 45. ACP"
    StaticMesh=StaticMesh'KillingFloorStatics.L85Ammo'
-}
+class NiceThompsonDrumAmmoPickup extends NiceAmmoPickup;
+defaultproperties
+{
+    AmmoAmount=40
+    InventoryType=Class'NicePack.NiceThompsonDrumAmmo'
+    PickupMessage="Rounds 45. ACP"
+    StaticMesh=StaticMesh'KillingFloorStatics.L85Ammo'
+}
--- a/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumAttachment.uc
+++ b/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumAttachment.uc
@ -1,4 +1,57 @@
-class NiceThompsonDrumAttachment extends NiceAttachment;
-defaultproperties
-{
    mMuzFlashClass=Class'ROEffects.MuzzleFlash3rdMP'
    mTracerClass=Class'KFMod.KFNewTracer'
    mShellCaseEmitterClass=Class'KFMod.KFShellSpewer'
    MovementAnims(0)="JogF_IJC_spThompson_Drum"
    MovementAnims(1)="JogB_IJC_spThompson_Drum"
    MovementAnims(2)="JogL_IJC_spThompson_Drum"
    MovementAnims(3)="JogR_IJC_spThompson_Drum"
    TurnLeftAnim="TurnL_IJC_spThompson_Drum"
    TurnRightAnim="TurnR_IJC_spThompson_Drum"
    CrouchAnims(0)="CHWalkF_IJC_spThompson_Drum"
    CrouchAnims(1)="CHWalkB_IJC_spThompson_Drum"
    CrouchAnims(2)="CHWalkL_IJC_spThompson_Drum"
    CrouchAnims(3)="CHWalkR_IJC_spThompson_Drum"
    WalkAnims(0)="WalkF_IJC_spThompson_Drum"
    WalkAnims(1)="WalkB_IJC_spThompson_Drum"
    WalkAnims(2)="WalkL_IJC_spThompson_Drum"
    WalkAnims(3)="WalkR_IJC_spThompson_Drum"
    CrouchTurnRightAnim="CH_TurnR_IJC_spThompson_Drum"
    CrouchTurnLeftAnim="CH_TurnL_IJC_spThompson_Drum"
    IdleCrouchAnim="CHIdle_IJC_spThompson_Drum"
    IdleWeaponAnim="Idle_IJC_spThompson_Drum"
    IdleRestAnim="Idle_IJC_spThompson_Drum"
    IdleChatAnim="Idle_IJC_spThompson_Drum"
    IdleHeavyAnim="Idle_IJC_spThompson_Drum"
    IdleRifleAnim="Idle_IJC_spThompson_Drum"
    FireAnims(0)="Fire_IJC_spThompson_Drum"
    FireAnims(1)="Fire_IJC_spThompson_Drum"
    FireAnims(2)="Fire_IJC_spThompson_Drum"
    FireAnims(3)="Fire_IJC_spThompson_Drum"
    FireAltAnims(0)="Fire_IJC_spThompson_Drum"
    FireAltAnims(1)="Fire_IJC_spThompson_Drum"
    FireAltAnims(2)="Fire_IJC_spThompson_Drum"
    FireAltAnims(3)="Fire_IJC_spThompson_Drum"
    FireCrouchAnims(0)="CHFire_IJC_spThompson_Drum"
    FireCrouchAnims(1)="CHFire_IJC_spThompson_Drum"
    FireCrouchAnims(2)="CHFire_IJC_spThompson_Drum"
    FireCrouchAnims(3)="CHFire_IJC_spThompson_Drum"
    FireCrouchAltAnims(0)="CHFire_IJC_spThompson_Drum"
    FireCrouchAltAnims(1)="CHFire_IJC_spThompson_Drum"
    FireCrouchAltAnims(2)="CHFire_IJC_spThompson_Drum"
    FireCrouchAltAnims(3)="CHFire_IJC_spThompson_Drum"
    HitAnims(0)="HitF_IJC_spThompson_Drum"
    HitAnims(1)="HitB_IJC_spThompson_Drum"
    HitAnims(2)="HitL_IJC_spThompson_Drum"
    HitAnims(3)="HitR_IJC_spThompson_Drum"
    PostFireBlendStandAnim="Blend_IJC_spThompson_Drum"
    PostFireBlendCrouchAnim="CHBlend_IJC_spThompson_Drum"
    MeshRef="KF_Weapons3rd2_IJC.spThompsonDrum_3rd"
    WeaponAmbientScale=2.000000
    bRapidFire=True
    bAltRapidFire=True
    SplashEffect=Class'ROEffects.BulletSplashEmitter'
    CullDistance=5000.000000
-}
+class NiceThompsonDrumAttachment extends NiceAttachment;
+defaultproperties
+{
+    mMuzFlashClass=Class'ROEffects.MuzzleFlash3rdMP'
+    mTracerClass=Class'KFMod.KFNewTracer'
+    mShellCaseEmitterClass=Class'KFMod.KFShellSpewer'
+    MovementAnims(0)="JogF_IJC_spThompson_Drum"
+    MovementAnims(1)="JogB_IJC_spThompson_Drum"
+    MovementAnims(2)="JogL_IJC_spThompson_Drum"
+    MovementAnims(3)="JogR_IJC_spThompson_Drum"
+    TurnLeftAnim="TurnL_IJC_spThompson_Drum"
+    TurnRightAnim="TurnR_IJC_spThompson_Drum"
+    CrouchAnims(0)="CHWalkF_IJC_spThompson_Drum"
+    CrouchAnims(1)="CHWalkB_IJC_spThompson_Drum"
+    CrouchAnims(2)="CHWalkL_IJC_spThompson_Drum"
+    CrouchAnims(3)="CHWalkR_IJC_spThompson_Drum"
+    WalkAnims(0)="WalkF_IJC_spThompson_Drum"
+    WalkAnims(1)="WalkB_IJC_spThompson_Drum"
+    WalkAnims(2)="WalkL_IJC_spThompson_Drum"
+    WalkAnims(3)="WalkR_IJC_spThompson_Drum"
+    CrouchTurnRightAnim="CH_TurnR_IJC_spThompson_Drum"
+    CrouchTurnLeftAnim="CH_TurnL_IJC_spThompson_Drum"
+    IdleCrouchAnim="CHIdle_IJC_spThompson_Drum"
+    IdleWeaponAnim="Idle_IJC_spThompson_Drum"
+    IdleRestAnim="Idle_IJC_spThompson_Drum"
+    IdleChatAnim="Idle_IJC_spThompson_Drum"
+    IdleHeavyAnim="Idle_IJC_spThompson_Drum"
+    IdleRifleAnim="Idle_IJC_spThompson_Drum"
+    FireAnims(0)="Fire_IJC_spThompson_Drum"
+    FireAnims(1)="Fire_IJC_spThompson_Drum"
+    FireAnims(2)="Fire_IJC_spThompson_Drum"
+    FireAnims(3)="Fire_IJC_spThompson_Drum"
+    FireAltAnims(0)="Fire_IJC_spThompson_Drum"
+    FireAltAnims(1)="Fire_IJC_spThompson_Drum"
+    FireAltAnims(2)="Fire_IJC_spThompson_Drum"
+    FireAltAnims(3)="Fire_IJC_spThompson_Drum"
+    FireCrouchAnims(0)="CHFire_IJC_spThompson_Drum"
+    FireCrouchAnims(1)="CHFire_IJC_spThompson_Drum"
+    FireCrouchAnims(2)="CHFire_IJC_spThompson_Drum"
+    FireCrouchAnims(3)="CHFire_IJC_spThompson_Drum"
+    FireCrouchAltAnims(0)="CHFire_IJC_spThompson_Drum"
+    FireCrouchAltAnims(1)="CHFire_IJC_spThompson_Drum"
+    FireCrouchAltAnims(2)="CHFire_IJC_spThompson_Drum"
+    FireCrouchAltAnims(3)="CHFire_IJC_spThompson_Drum"
+    HitAnims(0)="HitF_IJC_spThompson_Drum"
+    HitAnims(1)="HitB_IJC_spThompson_Drum"
+    HitAnims(2)="HitL_IJC_spThompson_Drum"
+    HitAnims(3)="HitR_IJC_spThompson_Drum"
+    PostFireBlendStandAnim="Blend_IJC_spThompson_Drum"
+    PostFireBlendCrouchAnim="CHBlend_IJC_spThompson_Drum"
+    MeshRef="KF_Weapons3rd2_IJC.spThompsonDrum_3rd"
+    WeaponAmbientScale=2.000000
+    bRapidFire=True
+    bAltRapidFire=True
+    SplashEffect=Class'ROEffects.BulletSplashEmitter'
+    CullDistance=5000.000000
+}
--- a/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumFire.uc
+++ b/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumFire.uc
@ -1,4 +1,32 @@
-class NiceThompsonDrumFire extends NiceHighROFFire;
-defaultproperties
-{
    FireEndSoundRef="KF_IJC_HalloweenSnd.ThompsonSMG_Fire_Loop_End_M"
    FireEndStereoSoundRef="KF_IJC_HalloweenSnd.ThompsonSMG_Fire_Loop_End_S"
    AmbientFireSoundRef="KF_IJC_HalloweenSnd.ThompsonSMG_Fire_Loop"
    ProjectileSpeed=14250.000000
    RecoilRate=0.080000
    maxVerticalRecoilAngle=240
    maxHorizontalRecoilAngle=120
    ShellEjectClass=Class'ROEffects.KFShellEjectMP5SMG'
    ShellEjectBoneName="Shell_eject"
    bRandomPitchFireSound=False
    FireSoundRef="KF_IJC_HalloweenSnd.Thompson_Fire_Single_M"
    StereoFireSoundRef="KF_IJC_HalloweenSnd.Thompson_Fire_Single_S"
    NoAmmoSoundRef="KF_AK47Snd.AK47_DryFire"
    DamageType=Class'NicePack.NiceDamTypeThompsonDrum'
    DamageMin=20
    DamageMax=20
    Momentum=12500.000000
    FireRate=0.085700
    AmmoClass=Class'NicePack.NiceThompsonDrumAmmo'
    ShakeRotMag=(X=50.000000,Y=50.000000,Z=350.000000)
    ShakeRotRate=(X=5000.000000,Y=5000.000000,Z=5000.000000)
    ShakeRotTime=0.750000
    ShakeOffsetMag=(X=6.000000,Y=3.000000,Z=7.500000)
    ShakeOffsetRate=(X=1000.000000,Y=1000.000000,Z=1000.000000)
    ShakeOffsetTime=1.250000
    BotRefireRate=0.150000
    FlashEmitterClass=Class'ROEffects.MuzzleFlash1stSTG'
    aimerror=42.000000
-}
+class NiceThompsonDrumFire extends NiceHighROFFire;
+defaultproperties
+{
+    FireEndSoundRef="KF_IJC_HalloweenSnd.ThompsonSMG_Fire_Loop_End_M"
+    FireEndStereoSoundRef="KF_IJC_HalloweenSnd.ThompsonSMG_Fire_Loop_End_S"
+    AmbientFireSoundRef="KF_IJC_HalloweenSnd.ThompsonSMG_Fire_Loop"
+    ProjectileSpeed=14250.000000
+    RecoilRate=0.080000
+    maxVerticalRecoilAngle=240
+    maxHorizontalRecoilAngle=120
+    ShellEjectClass=Class'ROEffects.KFShellEjectMP5SMG'
+    ShellEjectBoneName="Shell_eject"
+    bRandomPitchFireSound=False
+    FireSoundRef="KF_IJC_HalloweenSnd.Thompson_Fire_Single_M"
+    StereoFireSoundRef="KF_IJC_HalloweenSnd.Thompson_Fire_Single_S"
+    NoAmmoSoundRef="KF_AK47Snd.AK47_DryFire"
+    DamageType=Class'NicePack.NiceDamTypeThompsonDrum'
+    DamageMin=20
+    DamageMax=20
+    Momentum=12500.000000
+    FireRate=0.085700
+    AmmoClass=Class'NicePack.NiceThompsonDrumAmmo'
+    ShakeRotMag=(X=50.000000,Y=50.000000,Z=350.000000)
+    ShakeRotRate=(X=5000.000000,Y=5000.000000,Z=5000.000000)
+    ShakeRotTime=0.750000
+    ShakeOffsetMag=(X=6.000000,Y=3.000000,Z=7.500000)
+    ShakeOffsetRate=(X=1000.000000,Y=1000.000000,Z=1000.000000)
+    ShakeOffsetTime=1.250000
+    BotRefireRate=0.150000
+    FlashEmitterClass=Class'ROEffects.MuzzleFlash1stSTG'
+    aimerror=42.000000
+}
--- a/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumPickup.uc
+++ b/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumPickup.uc
@ -1,4 +1,25 @@
-class NiceThompsonDrumPickup extends NiceWeaponPickup;
-defaultproperties
-{
    Weight=5.000000
    cost=500
    AmmoCost=15
    BuyClipSize=50
    PowerValue=35
    SpeedValue=80
    RangeValue=45
    Description="This Tommy gun with a drum magazine was used heavily during the WWII pacific battles."
    ItemName="Rising Storm Tommy Gun"
    ItemShortName="R.S. Tommy Gun"
    AmmoItemName="45. ACP Ammo"
    AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
    CorrespondingPerkIndex=3
    EquipmentCategoryID=3
    InventoryType=Class'NicePack.NiceThompsonDrumSMG'
    PickupMessage="You got the Rising Storm Thompson with Drum Mag"
    PickupSound=Sound'KF_IJC_HalloweenSnd.Handling.Thompson_Handling_Bolt_Back'
    PickupForce="AssaultRiflePickup"
    StaticMesh=StaticMesh'KF_IJC_Summer_Weps.Thompson_Drum'
    CollisionRadius=25.000000
    CollisionHeight=5.000000
-}
+class NiceThompsonDrumPickup extends NiceWeaponPickup;
+defaultproperties
+{
+    Weight=5.000000
+    cost=500
+    AmmoCost=15
+    BuyClipSize=50
+    PowerValue=35
+    SpeedValue=80
+    RangeValue=45
+    Description="This Tommy gun with a drum magazine was used heavily during the WWII pacific battles."
+    ItemName="Rising Storm Tommy Gun"
+    ItemShortName="R.S. Tommy Gun"
+    AmmoItemName="45. ACP Ammo"
+    AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
+    CorrespondingPerkIndex=3
+    EquipmentCategoryID=3
+    InventoryType=Class'NicePack.NiceThompsonDrumSMG'
+    PickupMessage="You got the Rising Storm Thompson with Drum Mag"
+    PickupSound=Sound'KF_IJC_HalloweenSnd.Handling.Thompson_Handling_Bolt_Back'
+    PickupForce="AssaultRiflePickup"
+    StaticMesh=StaticMesh'KF_IJC_Summer_Weps.Thompson_Drum'
+    CollisionRadius=25.000000
+    CollisionHeight=5.000000
+}
--- a/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumSMG.uc
+++ b/sources/Weapons/Playable/AssaultRifles/Tommygun/NiceThompsonDrumSMG.uc
@ -1,4 +1,50 @@
-class NiceThompsonDrumSMG extends NiceAssaultRifle;
-defaultproperties
-{
    bSemiAutoFireEnabled=False
    reloadPreEndFrame=0.132000
    reloadEndFrame=0.570000
    reloadChargeEndFrame=0.810000
    reloadMagStartFrame=0.347000
    reloadChargeStartFrame=0.670000
    MagazineBone="Magazine_Drum"
    MagCapacity=40
    ReloadRate=3.800000
    ReloadAnim="Reload"
    ReloadAnimRate=1.000000
    WeaponReloadAnim="Reload_IJC_spThompson_Drum"
    Weight=5.000000
    bHasAimingMode=True
    IdleAimAnim="Idle_Iron"
    StandardDisplayFOV=55.000000
    SleeveNum=0
    TraderInfoTexture=Texture'KF_IJC_HUD.Trader_Weapon_Icons.Trader_Thompson_Drum'
    bIsTier2Weapon=True
    MeshRef="KF_IJC_Summer_Weps1.ThompsonDrum"
    SkinRefs(1)="KF_IJC_Summer_Weapons.Thompson_Drum.thompson_drum_cmb"
    SelectSoundRef="KF_IJC_HalloweenSnd.Thompson_Handling_Bolt_Back"
    HudImageRef="KF_IJC_HUD.WeaponSelect.Thompson_Drum_unselected"
    SelectedHudImageRef="KF_IJC_HUD.WeaponSelect.Thompson_Drum"
    PlayerIronSightFOV=65.000000
    ZoomedDisplayFOV=40.000000
    FireModeClass(0)=Class'NicePack.NiceThompsonDrumFire'
    FireModeClass(1)=Class'KFMod.NoFire'
    PutDownAnim="PutDown"
    SelectForce="SwitchToAssaultRifle"
    AIRating=0.550000
    CurrentRating=0.550000
    bShowChargingBar=True
    Description="This Tommy gun with a drum magazine was used heavily during the WWII pacific battles."
    EffectOffset=(X=100.000000,Y=25.000000,Z=-10.000000)
    DisplayFOV=55.000000
    Priority=124
    InventoryGroup=3
    GroupOffset=20
    PickupClass=Class'NicePack.NiceThompsonDrumPickup'
    PlayerViewOffset=(X=10.000000,Y=16.000000,Z=-7.000000)
    BobDamping=4.000000
    AttachmentClass=Class'NicePack.NiceThompsonDrumAttachment'
    IconCoords=(X1=245,Y1=39,X2=329,Y2=79)
    ItemName="Rising Storm Tommy Gun"
    TransientSoundVolume=1.250000
-}
+class NiceThompsonDrumSMG extends NiceAssaultRifle;
+defaultproperties
+{
+    bSemiAutoFireEnabled=False
+    reloadPreEndFrame=0.132000
+    reloadEndFrame=0.570000
+    reloadChargeEndFrame=0.810000
+    reloadMagStartFrame=0.347000
+    reloadChargeStartFrame=0.670000
+    MagazineBone="Magazine_Drum"
+    MagCapacity=40
+    ReloadRate=3.800000
+    ReloadAnim="Reload"
+    ReloadAnimRate=1.000000
+    WeaponReloadAnim="Reload_IJC_spThompson_Drum"
+    Weight=5.000000
+    bHasAimingMode=True
+    IdleAimAnim="Idle_Iron"
+    StandardDisplayFOV=55.000000
+    SleeveNum=0
+    TraderInfoTexture=Texture'KF_IJC_HUD.Trader_Weapon_Icons.Trader_Thompson_Drum'
+    bIsTier2Weapon=True
+    MeshRef="KF_IJC_Summer_Weps1.ThompsonDrum"
+    SkinRefs(1)="KF_IJC_Summer_Weapons.Thompson_Drum.thompson_drum_cmb"
+    SelectSoundRef="KF_IJC_HalloweenSnd.Thompson_Handling_Bolt_Back"
+    HudImageRef="KF_IJC_HUD.WeaponSelect.Thompson_Drum_unselected"
+    SelectedHudImageRef="KF_IJC_HUD.WeaponSelect.Thompson_Drum"
+    PlayerIronSightFOV=65.000000
+    ZoomedDisplayFOV=40.000000
+    FireModeClass(0)=Class'NicePack.NiceThompsonDrumFire'
+    FireModeClass(1)=Class'KFMod.NoFire'
+    PutDownAnim="PutDown"
+    SelectForce="SwitchToAssaultRifle"
+    AIRating=0.550000
+    CurrentRating=0.550000
+    bShowChargingBar=True
+    Description="This Tommy gun with a drum magazine was used heavily during the WWII pacific battles."
+    EffectOffset=(X=100.000000,Y=25.000000,Z=-10.000000)
+    DisplayFOV=55.000000
+    Priority=124
+    InventoryGroup=3
+    GroupOffset=20
+    PickupClass=Class'NicePack.NiceThompsonDrumPickup'
+    PlayerViewOffset=(X=10.000000,Y=16.000000,Z=-7.000000)
+    BobDamping=4.000000
+    AttachmentClass=Class'NicePack.NiceThompsonDrumAttachment'
+    IconCoords=(X1=245,Y1=39,X2=329,Y2=79)
+    ItemName="Rising Storm Tommy Gun"
+    TransientSoundVolume=1.250000
+}