From 6aac3e94e887d7d5b07bded721219669586aed88 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Thu, 12 Nov 2026 20:05:54 +0100 Subject: [PATCH] fix(t6): save combined sound and effect overrides in none attachment unique (#1090) --- src/ObjLoading/Asset/AssetCreationContext.h | 5 ++ .../T6/Weapon/WeaponInfoStringLoaderT6.cpp | 20 ++++- test/ObjCommonTestUtils/TestFiles.cpp | 19 +++++ test/ObjCommonTestUtils/TestFiles.h | 6 ++ .../Game/T6/Weapon/WeaponRawLoaderT6Test.cpp | 81 +++++++++++++++++++ .../Game/T6/Weapon/au_pdw57_none | 1 + .../Game/T6/Weapon/au_pdw57_silencer | 1 + .../Game/T6/Weapon/defaultattachment | 1 + test/ObjLoadingTests/Game/T6/Weapon/pdw57_mp | 3 + .../Game/T6/Weapon/silencer_smg | 1 + 10 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 test/ObjCommonTestUtils/TestFiles.cpp create mode 100644 test/ObjCommonTestUtils/TestFiles.h create mode 100644 test/ObjLoadingTests/Game/T6/Weapon/WeaponRawLoaderT6Test.cpp create mode 100644 test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_none create mode 100644 test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_silencer create mode 100644 test/ObjLoadingTests/Game/T6/Weapon/defaultattachment create mode 100644 test/ObjLoadingTests/Game/T6/Weapon/pdw57_mp create mode 100644 test/ObjLoadingTests/Game/T6/Weapon/silencer_smg diff --git a/src/ObjLoading/Asset/AssetCreationContext.h b/src/ObjLoading/Asset/AssetCreationContext.h index f670ecf6..bf1f6ffb 100644 --- a/src/ObjLoading/Asset/AssetCreationContext.h +++ b/src/ObjLoading/Asset/AssetCreationContext.h @@ -24,6 +24,11 @@ public: [[nodiscard]] bool IsAssetIgnored(asset_type_t assetType, const std::string& name) const; + template void Ignore(const std::string& assetName) + { + m_ignored_asset_lookup.emplace(assetName, Asset_t::EnumEntry); + } + std::unordered_multimap m_ignored_asset_lookup; }; diff --git a/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp b/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp index 1ab025ce..90b20a11 100644 --- a/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp +++ b/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp @@ -705,12 +705,28 @@ namespace void CalculateAttachmentFields(const WeaponFullDef& weapon) { + auto combinedSoundOverrides = 0; + auto combinedEffectOverrides = 0; for (auto attachmentUniqueIndex = 0u; attachmentUniqueIndex < std::extent_v; attachmentUniqueIndex++) { - if (weapon.attachmentUniques[attachmentUniqueIndex] == nullptr) + auto* attachmentUnique = weapon.attachmentUniques[attachmentUniqueIndex]; + if (!attachmentUnique) continue; - CalculateAttachmentFields(weapon, attachmentUniqueIndex, *weapon.attachmentUniques[attachmentUniqueIndex]); + CalculateAttachmentFields(weapon, attachmentUniqueIndex, *attachmentUnique); + + if (attachmentUniqueIndex > ATTACHMENT_NONE) + { + combinedSoundOverrides |= attachmentUnique->soundOverrides; + combinedEffectOverrides |= attachmentUnique->effectOverrides; + } + } + + auto* noneAttachmentUnique = weapon.attachmentUniques[ATTACHMENT_NONE]; + if (noneAttachmentUnique) + { + noneAttachmentUnique->soundOverrides |= combinedSoundOverrides; + noneAttachmentUnique->effectOverrides |= combinedEffectOverrides; } } } // namespace diff --git a/test/ObjCommonTestUtils/TestFiles.cpp b/test/ObjCommonTestUtils/TestFiles.cpp new file mode 100644 index 00000000..c6d1295a --- /dev/null +++ b/test/ObjCommonTestUtils/TestFiles.cpp @@ -0,0 +1,19 @@ +#include "TestFiles.h" + +#include +#include + +namespace fs = std::filesystem; + +std::string LoadTestFile(const std::filesystem::path& filePath) +{ + const auto fileSize = static_cast(fs::file_size(filePath)); + + std::ifstream file(filePath, std::ios::binary); + REQUIRE(file.is_open()); + + std::string data(fileSize, '\0'); + file.read(data.data(), fileSize); + + return data; +} diff --git a/test/ObjCommonTestUtils/TestFiles.h b/test/ObjCommonTestUtils/TestFiles.h new file mode 100644 index 00000000..8f342185 --- /dev/null +++ b/test/ObjCommonTestUtils/TestFiles.h @@ -0,0 +1,6 @@ +#pragma once + +#include +#include + +std::string LoadTestFile(const std::filesystem::path& filePath); diff --git a/test/ObjLoadingTests/Game/T6/Weapon/WeaponRawLoaderT6Test.cpp b/test/ObjLoadingTests/Game/T6/Weapon/WeaponRawLoaderT6Test.cpp new file mode 100644 index 00000000..b00148bd --- /dev/null +++ b/test/ObjLoadingTests/Game/T6/Weapon/WeaponRawLoaderT6Test.cpp @@ -0,0 +1,81 @@ +#include "Game/T6/Weapon/WeaponRawLoaderT6.h" + +#include "Game/T6/Weapon/AttachmentRawLoaderT6.h" +#include "Game/T6/Weapon/AttachmentUniqueRawLoaderT6.h" +#include "OatTestPaths.h" +#include "SearchPath/MockSearchPath.h" +#include "TestFiles.h" + +#include +#include + +using namespace T6; +using namespace Catch; + +TEST_CASE("WeaponRawLoaderT6: Weapon files are properly loaded (T6)", "[t6][weapon]") +{ + MockSearchPath searchPath; + + const auto currentDir = oat::paths::GetTestDirectory() / "ObjLoadingTests/Game/T6/Weapon"; + searchPath.AddFileData("weapons/pdw57_mp", LoadTestFile(currentDir / "pdw57_mp")); + searchPath.AddFileData("attachment/defaultattachment", LoadTestFile(currentDir / "defaultattachment")); + searchPath.AddFileData("attachment/silencer_smg", LoadTestFile(currentDir / "silencer_smg")); + searchPath.AddFileData("attachmentunique/au_pdw57_none", LoadTestFile(currentDir / "au_pdw57_none")); + searchPath.AddFileData("attachmentunique/au_pdw57_silencer", LoadTestFile(currentDir / "au_pdw57_silencer")); + + Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC); + + MemoryManager memory; + AssetCreatorCollection creatorCollection(zone); + IgnoredAssetLookup ignoredAssetLookup; + AssetCreationContext context(zone, &creatorCollection, &ignoredAssetLookup); + + creatorCollection.AddAssetCreator(attachment::CreateRawLoaderT6(memory, searchPath, zone)); + creatorCollection.AddAssetCreator(attachment_unique::CreateRawLoaderT6(memory, searchPath, zone)); + creatorCollection.AddDefaultAssetCreator(std::make_unique>(memory)); + creatorCollection.AddDefaultAssetCreator(std::make_unique>(memory)); + creatorCollection.AddDefaultAssetCreator(std::make_unique>(memory)); + creatorCollection.AddDefaultAssetCreator(std::make_unique>(memory)); + creatorCollection.AddDefaultAssetCreator(std::make_unique>(memory)); + ignoredAssetLookup.Ignore("weapon/muzzleflashes/fx_muz_smg_flash_1p"); + ignoredAssetLookup.Ignore("weapon/muzzleflashes/fx_muz_smg_flash_3p"); + ignoredAssetLookup.Ignore("weapon/shellejects/fx_rifle"); + ignoredAssetLookup.Ignore("weapon/muzzleflashes/fx_muz_silencer_md"); + ignoredAssetLookup.Ignore("weapon/muzzleflashes/fx_muz_silencer_md_3p"); + ignoredAssetLookup.Ignore("reticle_side_small"); + ignoredAssetLookup.Ignore("hud_mp_firerate_auto"); + ignoredAssetLookup.Ignore("menu_mp_weapons_ar57"); + ignoredAssetLookup.Ignore("smg"); + ignoredAssetLookup.Ignore("smg_enemy"); + ignoredAssetLookup.Ignore("camo_pdw57"); + ignoredAssetLookup.Ignore("t6_wpn_smg_pdw57_view"); + ignoredAssetLookup.Ignore("t6_wpn_smg_pdw57_world"); + ignoredAssetLookup.Ignore("t6_attach_mag_pdw57_view"); + ignoredAssetLookup.Ignore("t6_attach_mag_pdw57_world"); + ignoredAssetLookup.Ignore("t6_attach_smg_silencer1_view"); + ignoredAssetLookup.Ignore("t6_attach_smg_silencer1_world"); + + auto loader = weapon::CreateRawLoaderT6(memory, searchPath, zone); + auto result = loader->CreateAsset("pdw57_mp", context); + + REQUIRE(result.HasBeenSuccessful()); + + const auto* weaponAsset = reinterpret_cast*>(result.GetAssetInfo()); + const auto* weapon = weaponAsset->Asset(); + const auto* none = weapon->attachments[ATTACHMENT_NONE]; + const auto* noneAu = weapon->attachmentUniques[ATTACHMENT_NONE]; + const auto* silencer = weapon->attachments[ATTACHMENT_SILENCER]; + const auto* silencerAu = weapon->attachmentUniques[ATTACHMENT_SILENCER]; + + REQUIRE(std::string(weapon->szInternalName) == "pdw57_mp"); + CHECK(weapon->iAttachments == (1u << ATTACHMENT_SILENCER)); + REQUIRE(none); + REQUIRE(noneAu); + REQUIRE(silencer); + REQUIRE(silencerAu); + + CHECK(noneAu->effectOverrides == ((1u << ATTACHMENT_OVERRIDE_EFFECT_VIEW_FLASH) | (1u << ATTACHMENT_OVERRIDE_EFFECT_WORLD_FLASH))); + CHECK(noneAu->soundOverrides == ((1u << ATTACHMENT_OVERRIDE_SOUND_FIRE) | (1u << ATTACHMENT_OVERRIDE_SOUND_FIRE_PLAYER))); + CHECK(noneAu->effectOverrides == silencerAu->effectOverrides); + CHECK(noneAu->soundOverrides == silencerAu->soundOverrides); +} diff --git a/test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_none b/test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_none new file mode 100644 index 00000000..29e9d4de --- /dev/null +++ b/test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_none @@ -0,0 +1 @@ +ATTACHMENTUNIQUEFILE\attachmentType\none\locNone\1\locHelmet\4\locHead\4\locNeck\5\locTorsoUpper\1\locTorsoMid\1\locTorsoLower\0.9\locRightArmUpper\0.8\locRightArmLower\0.6\locRightHand\0.4\locLeftArmUpper\0.8\locLeftArmLower\0.6\locLeftHand\0.4\locRightLegUpper\0.8\locRightLegLower\0.6\locRightFoot\0.4\locLeftLegUpper\0.8\locLeftLegLower\0.6\locLeftFoot\0.4\locGun\0\viewModel\\viewModelAdditional\\viewModelADS\\worldModel\\worldModelAdditional\\viewModelTag\\worldModelTag\\viewModelOffsetX\0\viewModelOffsetY\0\viewModelOffsetZ\0\viewModelOffsetPitch\0\viewModelOffsetYaw\0\viewModelOffsetRoll\0\worldModelOffsetX\0\worldModelOffsetY\0\worldModelOffsetZ\0\worldModelOffsetPitch\0\worldModelOffsetYaw\0\worldModelOffsetRoll\0\viewModelAddOffsetX\0\viewModelAddOffsetY\0\viewModelAddOffsetZ\0\viewModelAddOffsetPitch\0\viewModelAddOffsetYaw\0\viewModelAddOffsetRoll\0\worldModelAddOffsetX\0\worldModelAddOffsetY\0\worldModelAddOffsetZ\0\worldModelAddOffsetPitch\0\worldModelAddOffsetYaw\0\worldModelAddOffsetRoll\0\hideTags\tag_fast_mag\camo\camo_pdw57\disableBaseWeaponAttachment\0\disableBaseWeaponClip\0\overrideBaseWeaponAttachmentOffsets\0\viewModelOffsetBaseAttachmentX\0\viewModelOffsetBaseAttachmentY\0\viewModelOffsetBaseAttachmentZ\0\worldModelOffsetBaseAttachmentX\0\worldModelOffsetBaseAttachmentY\0\worldModelOffsetBaseAttachmentZ\0\altWeapon\\DualWieldWeapon\\adsOverlayShader\\adsOverlayShaderLowRes\\adsOverlayReticle\none\firstRaiseTime\0\altRaiseTime\0\altDropTime\0\reloadAmmoAdd\0\reloadStartAdd\0\segmentedReload\0\idleAnim\\idleAnimLeft\\emptyIdleAnim\\emptyIdleAnimLeft\\fireIntroAnim\\fireAnim\\fireAnimLeft\\holdFireAnim\\lastShotAnim\\lastShotAnimLeft\\flourishAnim\\flourishAnimLeft\\detonateAnim\\rechamberAnim\\meleeAnim\\meleeAnimEmpty\\meleeAnim1\\meleeAnim2\\meleeAnim3\\meleeChargeAnim\\meleeChargeAnimEmpty\\reloadAnim\\reloadAnimRight\\reloadAnimLeft\\reloadEmptyAnim\\reloadEmptyAnimLeft\\reloadStartAnim\\reloadEndAnim\\reloadQuickAnim\\reloadQuickEmptyAnim\\raiseAnim\\dropAnim\\firstRaiseAnim\\altRaiseAnim\\altDropAnim\\quickRaiseAnim\\quickDropAnim\\emptyRaiseAnim\\emptyDropAnim\\sprintInAnim\\sprintLoopAnim\\sprintOutAnim\\sprintInEmptyAnim\\sprintLoopEmptyAnim\\sprintOutEmptyAnim\\lowReadyInAnim\\lowReadyLoopAnim\\lowReadyOutAnim\\contFireInAnim\\contFireLoopAnim\\contFireOutAnim\\crawlInAnim\\crawlForwardAnim\\crawlBackAnim\\crawlRightAnim\\crawlLeftAnim\\crawlOutAnim\\crawlEmptyInAnim\\crawlEmptyForwardAnim\\crawlEmptyBackAnim\\crawlEmptyRightAnim\\crawlEmptyLeftAnim\\crawlEmptyOutAnim\\deployAnim\\breakdownAnim\\nightVisionWearAnim\\nightVisionRemoveAnim\\adsFireAnim\\adsLastShotAnim\\adsRechamberAnim\\adsUpAnim\\adsDownAnim\\adsUpOtherScopeAnim\\adsFireIntroAnim\\dtp_in\\dtp_loop\\dtp_out\\dtp_empty_in\\dtp_empty_loop\\dtp_empty_out\\slide_in\\mantleAnim\\sprintCameraAnim\\dtpInCameraAnim\\dtpLoopCameraAnim\\dtpOutCameraAnim\\mantleCameraAnim\\fireSound\\fireSoundPlayer\\loopFireSound\\loopFireSoundPlayer\\loopFireEndSound\\loopFireEndSoundPlayer\\startFireSound\\stopFireSound\\startFireSoundPlayer\\stopFireSoundPlayer\\lastShotSound\\lastShotSoundPlayer\\killcamStartFireSound\\killcamStartFireSoundPlayer\\viewFlashEffect\\worldFlashEffect\\tracerType\\enemyTracerType\\adsDofStart\0\adsDofEnd\0\overrideLeftHandIK\0\overrideLeftHandProneIK\0\ikLeftHandOffsetF\0\ikLeftHandOffsetR\0\ikLeftHandOffsetU\0\ikLeftHandRotationP\0\ikLeftHandRotationY\0\ikLeftHandRotationR\0\ikLeftHandProneOffsetF\0\ikLeftHandProneOffsetR\0\ikLeftHandProneOffsetU\0\ikLeftHandProneRotationP\0\ikLeftHandProneRotationY\0\ikLeftHandProneRotationR\0\customFloat0\0\customFloat1\0\customFloat2\0\customBool0\0\customBool1\0\customBool2\0 \ No newline at end of file diff --git a/test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_silencer b/test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_silencer new file mode 100644 index 00000000..38be28a4 --- /dev/null +++ b/test/ObjLoadingTests/Game/T6/Weapon/au_pdw57_silencer @@ -0,0 +1 @@ +ATTACHMENTUNIQUEFILE\attachmentType\silencer\locNone\1\locHelmet\4\locHead\4\locNeck\5\locTorsoUpper\1\locTorsoMid\1\locTorsoLower\0.9\locRightArmUpper\0.8\locRightArmLower\0.6\locRightHand\0.4\locLeftArmUpper\0.8\locLeftArmLower\0.6\locLeftHand\0.4\locRightLegUpper\0.8\locRightLegLower\0.6\locRightFoot\0.4\locLeftLegUpper\0.8\locLeftLegLower\0.6\locLeftFoot\0.4\locGun\0\viewModel\t6_attach_smg_silencer1_view\viewModelAdditional\\viewModelADS\\worldModel\t6_attach_smg_silencer1_world\worldModelAdditional\\viewModelTag\\worldModelTag\\viewModelOffsetX\9.181\viewModelOffsetY\0\viewModelOffsetZ\1.28\viewModelOffsetPitch\0\viewModelOffsetYaw\0\viewModelOffsetRoll\0\worldModelOffsetX\-0.93\worldModelOffsetY\0\worldModelOffsetZ\-0.139\worldModelOffsetPitch\0\worldModelOffsetYaw\0\worldModelOffsetRoll\0\viewModelAddOffsetX\0\viewModelAddOffsetY\0\viewModelAddOffsetZ\0\viewModelAddOffsetPitch\0\viewModelAddOffsetYaw\0\viewModelAddOffsetRoll\0\worldModelAddOffsetX\0\worldModelAddOffsetY\0\worldModelAddOffsetZ\0\worldModelAddOffsetPitch\0\worldModelAddOffsetYaw\0\worldModelAddOffsetRoll\0\hideTags\tag_fast_mag\camo\camo_pdw57\disableBaseWeaponAttachment\0\disableBaseWeaponClip\0\overrideBaseWeaponAttachmentOffsets\0\viewModelOffsetBaseAttachmentX\0\viewModelOffsetBaseAttachmentY\0\viewModelOffsetBaseAttachmentZ\0\worldModelOffsetBaseAttachmentX\0\worldModelOffsetBaseAttachmentY\0\worldModelOffsetBaseAttachmentZ\0\altWeapon\\DualWieldWeapon\\adsOverlayShader\\adsOverlayShaderLowRes\\adsOverlayReticle\none\firstRaiseTime\0\altRaiseTime\0\altDropTime\0\reloadAmmoAdd\0\reloadStartAdd\0\segmentedReload\0\idleAnim\\idleAnimLeft\\emptyIdleAnim\\emptyIdleAnimLeft\\fireIntroAnim\\fireAnim\\fireAnimLeft\\holdFireAnim\\lastShotAnim\\lastShotAnimLeft\\flourishAnim\\flourishAnimLeft\\detonateAnim\\rechamberAnim\\meleeAnim\\meleeAnimEmpty\\meleeAnim1\\meleeAnim2\\meleeAnim3\\meleeChargeAnim\\meleeChargeAnimEmpty\\reloadAnim\\reloadAnimRight\\reloadAnimLeft\\reloadEmptyAnim\\reloadEmptyAnimLeft\\reloadStartAnim\\reloadEndAnim\\reloadQuickAnim\\reloadQuickEmptyAnim\\raiseAnim\\dropAnim\\firstRaiseAnim\\altRaiseAnim\\altDropAnim\\quickRaiseAnim\\quickDropAnim\\emptyRaiseAnim\\emptyDropAnim\\sprintInAnim\\sprintLoopAnim\\sprintOutAnim\\sprintInEmptyAnim\\sprintLoopEmptyAnim\\sprintOutEmptyAnim\\lowReadyInAnim\\lowReadyLoopAnim\\lowReadyOutAnim\\contFireInAnim\\contFireLoopAnim\\contFireOutAnim\\crawlInAnim\\crawlForwardAnim\\crawlBackAnim\\crawlRightAnim\\crawlLeftAnim\\crawlOutAnim\\crawlEmptyInAnim\\crawlEmptyForwardAnim\\crawlEmptyBackAnim\\crawlEmptyRightAnim\\crawlEmptyLeftAnim\\crawlEmptyOutAnim\\deployAnim\\breakdownAnim\\nightVisionWearAnim\\nightVisionRemoveAnim\\adsFireAnim\\adsLastShotAnim\\adsRechamberAnim\\adsUpAnim\\adsDownAnim\\adsUpOtherScopeAnim\\adsFireIntroAnim\\dtp_in\\dtp_loop\\dtp_out\\dtp_empty_in\\dtp_empty_loop\\dtp_empty_out\\slide_in\\mantleAnim\\sprintCameraAnim\\dtpInCameraAnim\\dtpLoopCameraAnim\\dtpOutCameraAnim\\mantleCameraAnim\\fireSound\wpn_pdw57_silencer_fire_npc\fireSoundPlayer\wpn_pdw57_silencer_fire_plr\loopFireSound\\loopFireSoundPlayer\\loopFireEndSound\\loopFireEndSoundPlayer\\startFireSound\\stopFireSound\\startFireSoundPlayer\\stopFireSoundPlayer\\lastShotSound\\lastShotSoundPlayer\\killcamStartFireSound\\killcamStartFireSoundPlayer\\viewFlashEffect\weapon/muzzleflashes/fx_muz_silencer_md\worldFlashEffect\weapon/muzzleflashes/fx_muz_silencer_md_3p\tracerType\\enemyTracerType\\adsDofStart\0\adsDofEnd\0\overrideLeftHandIK\0\overrideLeftHandProneIK\0\ikLeftHandOffsetF\0\ikLeftHandOffsetR\0\ikLeftHandOffsetU\0\ikLeftHandRotationP\0\ikLeftHandRotationY\0\ikLeftHandRotationR\0\ikLeftHandProneOffsetF\0\ikLeftHandProneOffsetR\0\ikLeftHandProneOffsetU\0\ikLeftHandProneRotationP\0\ikLeftHandProneRotationY\0\ikLeftHandProneRotationR\0\customFloat0\0\customFloat1\0\customFloat2\0\customBool0\0\customBool1\0\customBool2\0 \ No newline at end of file diff --git a/test/ObjLoadingTests/Game/T6/Weapon/defaultattachment b/test/ObjLoadingTests/Game/T6/Weapon/defaultattachment new file mode 100644 index 00000000..58f5b5dc --- /dev/null +++ b/test/ObjLoadingTests/Game/T6/Weapon/defaultattachment @@ -0,0 +1 @@ +ATTACHMENTFILE\displayName\\attachmentType\none\penetrateType\none\firstRaisePriority\1\hipIdleAmount\0\fireType\Full Auto\damageRangeScale\1\adsZoomFov1\1\adsZoomFov2\1\adsZoomFov3\1\adsZoomInFrac\0\adsZoomOutFrac\0\adsTransInTimeScale\1\adsTransOutTimeScale\1\adsRecoilReductionRate\0\adsRecoilReductionLimit\0\adsViewKickCenterSpeedScale\1\adsIdleAmountScale\1\swayOverride\0\swayMaxAngle\0\swayLerpSpeed\1\swayPitchScale\-2\swayYawScale\-2\swayHorizScale\-2\swayVertScale\-2\adsSwayOverride\0\adsSwayMaxAngle\0\adsSwayLerpSpeed\1\adsSwayPitchScale\-2\adsSwayYawScale\-2\adsSwayHorizScale\-2\adsSwayVertScale\-2\adsMoveSpeedScale\1\hipSpreadMinScale\1\hipSpreadMaxScale\1\strafeRotR\-300\standMoveF\-300\standRotP\-300\standRotY\0\standRotR\-300\fireTimeScale\1\reloadTimeScale\1\reloadEmptyTimeScale\1\reloadAddTimeScale\1\reloadQuickTimeScale\1\reloadQuickEmptyTimeScale\1\reloadQuickAddTimeScale\1\perks1\0\perks0\0\altWeaponAdsOnly\0\altWeaponDisableSwitching\0\altScopeADSTransInTime\0\altScopeADSTransOutTime\0\silenced\0\dualMag\0\laserSight\0\infrared\0\useAsMelee\0\dualWield\0\sharedAmmo\0\mmsWeapon\0\mmsInScope\0\mmsFOV\0\mmsAspect\0.33\mmsMaxDist\100\clipSizeScale\1\clipSize\10\stackFire\0\stackFireSpread\0\stackFireAccuracyDecay\0\customFloat0\0\customFloat1\0\customFloat2\0\customBool0\0\customBool1\0\customBool2\0 \ No newline at end of file diff --git a/test/ObjLoadingTests/Game/T6/Weapon/pdw57_mp b/test/ObjLoadingTests/Game/T6/Weapon/pdw57_mp new file mode 100644 index 00000000..64f13eac --- /dev/null +++ b/test/ObjLoadingTests/Game/T6/Weapon/pdw57_mp @@ -0,0 +1,3 @@ +WEAPONFILE\displayName\WEAPON_PDW57\AIOverlayDescription\\modeName\\playerAnimType\g11\gunModel\t6_wpn_smg_pdw57_view\gunModel2\\gunModel3\\gunModel4\\gunModel5\\gunModel6\\gunModel7\\gunModel8\\gunModel9\\gunModel10\\gunModel11\\gunModel12\\gunModel13\\gunModel14\\gunModel15\\gunModel16\\handModel\\hideTags\tag_fast_mag\notetrackSoundMap\\idleAnim\viewmodel_pdw57_idle\idleAnimLeft\\emptyIdleAnim\\emptyIdleAnimLeft\\fireIntroAnim\viewmodel_pdw57_fire\fireAnim\viewmodel_pdw57_fire\fireAnimLeft\\holdFireAnim\\lastShotAnim\\lastShotAnimLeft\\flourishAnim\\flourishAnimLeft\\detonateAnim\\rechamberAnim\\meleeAnim\\meleeAnimEmpty\\meleeAnim1\\meleeAnim2\\meleeAnim3\\meleeChargeAnim\\meleeChargeAnimEmpty\\reloadAnim\viewmodel_pdw57_reload\reloadAnimRight\\reloadAnimLeft\\reloadEmptyAnim\viewmodel_pdw57_reload_empty\reloadEmptyAnimLeft\\reloadStartAnim\\reloadEndAnim\\reloadQuickAnim\\reloadQuickEmptyAnim\\raiseAnim\viewmodel_pdw57_pullout\dropAnim\viewmodel_pdw57_putaway\firstRaiseAnim\viewmodel_pdw57_first_raise\altRaiseAnim\viewmodel_pdw57_pullout\altDropAnim\viewmodel_pdw57_putaway\quickRaiseAnim\viewmodel_pdw57_pullout_quick\quickDropAnim\viewmodel_pdw57_putaway_quick\emptyRaiseAnim\viewmodel_pdw57_pullout\emptyDropAnim\viewmodel_pdw57_putaway\sprintInAnim\viewmodel_pdw57_sprint_in\sprintLoopAnim\viewmodel_pdw57_sprint_loop\sprintOutAnim\viewmodel_pdw57_sprint_out\sprintInEmptyAnim\\sprintLoopEmptyAnim\\sprintOutEmptyAnim\\lowReadyInAnim\\lowReadyLoopAnim\\lowReadyOutAnim\\contFireInAnim\\contFireLoopAnim\\contFireOutAnim\\crawlInAnim\viewmodel_pdw57_crawl_in\crawlForwardAnim\viewmodel_pdw57_crawl_forward\crawlBackAnim\viewmodel_pdw57_crawl_back\crawlRightAnim\viewmodel_pdw57_crawl_right\crawlLeftAnim\viewmodel_pdw57_crawl_left\crawlOutAnim\viewmodel_pdw57_crawl_out\crawlEmptyInAnim\\crawlEmptyForwardAnim\\crawlEmptyBackAnim\\crawlEmptyRightAnim\\crawlEmptyLeftAnim\\crawlEmptyOutAnim\\deployAnim\\nightVisionWearAnim\\nightVisionRemoveAnim\\adsFireAnim\viewmodel_pdw57_ads_fire\adsLastShotAnim\\adsRechamberAnim\\adsUpAnim\viewmodel_pdw57_ads_up\adsDownAnim\viewmodel_pdw57_ads_down\adsUpOtherScopeAnim\\adsFireIntroAnim\\breakdownAnim\\dtp_in\viewmodel_pdw57_d2p_in\dtp_loop\viewmodel_pdw57_d2p_loop\dtp_out\viewmodel_pdw57_d2p_out\dtp_empty_in\\dtp_empty_loop\\dtp_empty_out\\slide_in\\mantleAnim\\sprintCameraAnim\\dtpInCameraAnim\\dtpLoopCameraAnim\\dtpOutCameraAnim\\mantleCameraAnim\\script\\weaponType\bullet\weaponClass\smg\penetrateType\small\impactType\bullet_small\inventoryType\primary\fireType\Full Auto\clipType\bottom\barrelType\Single\offhandClass\None\offhandSlot\None\viewFlashEffect\weapon/muzzleflashes/fx_muz_smg_flash_1p\worldFlashEffect\weapon/muzzleflashes/fx_muz_smg_flash_3p\barrelCooldownEffect\\barrelCooldownMinCount\0\viewFlashOffsetF\0\viewFlashOffsetR\0\viewFlashOffsetU\0\worldFlashOffsetF\0\worldFlashOffsetR\0\worldFlashOffsetU\0\pickupSound\fly_generic_pickup_npc\pickupSoundPlayer\fly_generic_pickup_plr\ammoPickupSound\wpn_ammo_pickup_npc\ammoPickupSoundPlayer\wpn_ammo_pickup_plr\projectileSound\\pullbackSound\\pullbackSoundPlayer\\fireSound\wpn_pdw57_fire_npc\crackSound\\whizbySound\\fireSoundPlayer\wpn_pdw57_fire_plr\loopFireSound\\loopFireSoundPlayer\\loopFireEndSound\\loopFireEndSoundPlayer\\startFireSound\\stopFireSound\\killcamStartFireSound\\startFireSoundPlayer\\stopFireSoundPlayer\\killcamStartFireSoundPlayer\\lastShotSound\\lastShotSoundPlayer\\emptyFireSound\wpn_generic_dryfire_npc\emptyFireSoundPlayer\wpn_generic_dryfire_plr\meleeSwipeSound\\meleeSwipeSoundPlayer\\meleeHitSound\\meleeMissSound\\rechamberSound\\rechamberSoundPlayer\\reloadSound\\reloadSoundPlayer\\reloadEmptySound\\reloadEmptySoundPlayer\\reloadStartSound\\reloadStartSoundPlayer\\reloadEndSound\\reloadEndSoundPlayer\\rotateLoopSound\\rotateLoopSoundPlayer\\rotateStopSound\\rotateStopSoundPlayer\\deploySound\\deploySoundPlayer\\finishDeploySound\\finishDeploySoundPlayer\\breakdownSound\\breakdownSoundPlayer\\finishBreakdownSound\\finishBreakdownSoundPlayer\\detonateSound\\detonateSoundPlayer\\nightVisionWearSound\\nightVisionWearSoundPlayer\\nightVisionRemoveSound\\nightVisionRemoveSoundPlayer\\raiseSound\fly_generic_raise_npc\raiseSoundPlayer\fly_generic_raise_plr\firstRaiseSound\fly_generic_first_raise_npc\firstRaiseSoundPlayer\fly_generic_first_raise_plr\altSwitchSound\\altSwitchSoundPlayer\\adsRaiseSoundPlayer\fly_generic_ads_plr\adsLowerSoundPlayer\fly_generic_ads_lower_plr\putawaySound\fly_generic_down_npc\putawaySoundPlayer\fly_generic_down_plr\overheatSound\\overheatSoundPlayer\\adsZoomSound\\shellCasing\prj_brass_impact_small\shellCasingPlayer\prj_brass_impact_plr_small\bounceSound\\standMountedWeapdef\\crouchMountedWeapdef\\proneMountedWeapdef\\viewShellEjectEffect\weapon/shellejects/fx_rifle\worldShellEjectEffect\weapon/shellejects/fx_rifle\viewLastShotEjectEffect\weapon/shellejects/fx_rifle\worldLastShotEjectEffect\weapon/shellejects/fx_rifle\viewShellEjectOffsetF\0\viewShellEjectOffsetR\0\viewShellEjectOffsetU\0\worldShellEjectOffsetF\0\worldShellEjectOffsetR\0\worldShellEjectOffsetU\0\viewShellEjectRotationP\0\viewShellEjectRotationY\0\viewShellEjectRotationR\0\worldShellEjectRotationP\0\worldShellEjectRotationY\0\worldShellEjectRotationR\0\reticleCenter\\reticleSide\reticle_side_small\reticleCenterSize\4\reticleSideSize\8\reticleMinOfs\0\activeReticleType\None\standMoveF\0\standMoveR\0\standMoveU\0\standRotP\2\standRotY\0\standRotR\-2\duckedOfsF\-0.5\duckedOfsR\0.5\duckedOfsU\-0.1\duckedMoveF\-0.5\duckedMoveR\0\duckedMoveU\0\duckedSprintOfsF\0\duckedSprintOfsR\0\duckedSprintOfsU\0\duckedSprintRotP\0\duckedSprintRotY\0\duckedSprintRotR\0\duckedSprintBobH\0\duckedSprintBobV\0\duckedSprintScale\0\sprintOfsF\0\sprintOfsR\0\sprintOfsU\0\sprintRotP\0\sprintRotY\0\sprintRotR\0\sprintBobH\0\sprintBobV\0\sprintScale\0.9\lowReadyOfsF\0\lowReadyOfsR\0\lowReadyOfsU\0\lowReadyRotP\0\lowReadyRotY\0\lowReadyRotR\0\rideOfsF\0\rideOfsR\0\rideOfsU\0\rideRotP\0\rideRotY\0\rideRotR\0\dtpOfsF\0\dtpOfsR\0\dtpOfsU\0\dtpRotP\0\dtpRotY\0\dtpRotR\0\dtpBobH\0\dtpBobV\0\dtpScale\1\mantleOfsF\-1\mantleOfsR\-1\mantleOfsU\2\mantleRotP\10\mantleRotY\0\mantleRotR\0\slideOfsF\0\slideOfsR\0\slideOfsU\0\slideRotP\0\slideRotY\0\slideRotR\0\duckedRotP\2\duckedRotY\0\duckedRotR\-2\proneOfsF\0.3\proneOfsR\0.2\proneOfsU\0\proneMoveF\0\proneMoveR\0\proneMoveU\0\proneRotP\0\proneRotY\3\proneRotR\-3\strafeMoveF\0\strafeMoveR\0.5\strafeMoveU\0\strafeRotP\0\strafeRotY\0\strafeRotR\6\posMoveRate\6\posProneMoveRate\5\standMoveMinSpeed\0\duckedMoveMinSpeed\0\proneMoveMinSpeed\0\posRotRate\6\posProneRotRate\6\standRotMinSpeed\0\duckedRotMinSpeed\0\proneRotMinSpeed\0\worldModel\t6_wpn_smg_pdw57_world\worldModel2\\worldModel3\\worldModel4\\worldModel5\\worldModel6\\worldModel7\\worldModel8\\worldModel9\\worldModel10\\worldModel11\\worldModel12\\worldModel13\\worldModel14\\worldModel15\\worldModel16\\attachViewModel1\\attachViewModel2\\attachViewModel3\\attachViewModel4\\attachViewModel5\\attachViewModel6\\attachViewModel7\t6_attach_mag_pdw57_view\attachViewModel8\\attachWorldModel1\\attachWorldModel2\\attachWorldModel3\\attachWorldModel4\\attachWorldModel5\\attachWorldModel6\\attachWorldModel7\t6_attach_mag_pdw57_world\attachWorldModel8\\attachViewModelTag1\\attachViewModelTag2\\attachViewModelTag3\\attachViewModelTag4\\attachViewModelTag5\\attachViewModelTag6\\attachViewModelTag7\\attachViewModelTag8\\attachWorldModelTag1\\attachWorldModelTag2\\attachWorldModelTag3\\attachWorldModelTag4\\attachWorldModelTag5\\attachWorldModelTag6\\attachWorldModelTag7\\attachWorldModelTag8\\attachViewModelOffsetX1\0\attachViewModelOffsetY1\0\attachViewModelOffsetZ1\0\attachViewModelOffsetX2\0\attachViewModelOffsetY2\0\attachViewModelOffsetZ2\0\attachViewModelOffsetX3\0\attachViewModelOffsetY3\0\attachViewModelOffsetZ3\0\attachViewModelOffsetX4\0\attachViewModelOffsetY4\0\attachViewModelOffsetZ4\0\attachViewModelOffsetX5\0\attachViewModelOffsetY5\0\attachViewModelOffsetZ5\0\attachViewModelOffsetX6\0\attachViewModelOffsetY6\0\attachViewModelOffsetZ6\0\attachViewModelOffsetX7\6.429\attachViewModelOffsetY7\0\attachViewModelOffsetZ7\1.922\attachViewModelOffsetX8\0\attachViewModelOffsetY8\0\attachViewModelOffsetZ8\0\attachWorldModelOffsetX1\0\attachWorldModelOffsetY1\0\attachWorldModelOffsetZ1\0\attachWorldModelOffsetX2\0\attachWorldModelOffsetY2\0\attachWorldModelOffsetZ2\0\attachWorldModelOffsetX3\0\attachWorldModelOffsetY3\0\attachWorldModelOffsetZ3\0\attachWorldModelOffsetX4\0\attachWorldModelOffsetY4\0\attachWorldModelOffsetZ4\0\attachWorldModelOffsetX5\0\attachWorldModelOffsetY5\0\attachWorldModelOffsetZ5\0\attachWorldModelOffsetX6\0\attachWorldModelOffsetY6\0\attachWorldModelOffsetZ6\0\attachWorldModelOffsetX7\-6.863\attachWorldModelOffsetY7\0\attachWorldModelOffsetZ7\0.586\attachWorldModelOffsetX8\0\attachWorldModelOffsetY8\0\attachWorldModelOffsetZ8\0\attachViewModelOffsetPitch1\0\attachViewModelOffsetYaw1\0\attachViewModelOffsetRoll1\0\attachViewModelOffsetPitch2\0\attachViewModelOffsetYaw2\0\attachViewModelOffsetRoll2\0\attachViewModelOffsetPitch3\0\attachViewModelOffsetYaw3\0\attachViewModelOffsetRoll3\0\attachViewModelOffsetPitch4\0\attachViewModelOffsetYaw4\0\attachViewModelOffsetRoll4\0\attachViewModelOffsetPitch5\0\attachViewModelOffsetYaw5\0\attachViewModelOffsetRoll5\0\attachViewModelOffsetPitch6\0\attachViewModelOffsetYaw6\0\attachViewModelOffsetRoll6\0\attachViewModelOffsetPitch7\0\attachViewModelOffsetYaw7\0\attachViewModelOffsetRoll7\0\attachViewModelOffsetPitch8\0\attachViewModelOffsetYaw8\0\attachViewModelOffsetRoll8\0\attachWorldModelOffsetPitch1\0\attachWorldModelOffsetYaw1\0\attachWorldModelOffsetRoll1\0\attachWorldModelOffsetPitch2\0\attachWorldModelOffsetYaw2\0\attachWorldModelOffsetRoll2\0\attachWorldModelOffsetPitch3\0\attachWorldModelOffsetYaw3\0\attachWorldModelOffsetRoll3\0\attachWorldModelOffsetPitch4\0\attachWorldModelOffsetYaw4\0\attachWorldModelOffsetRoll4\0\attachWorldModelOffsetPitch5\0\attachWorldModelOffsetYaw5\0\attachWorldModelOffsetRoll5\0\attachWorldModelOffsetPitch6\0\attachWorldModelOffsetYaw6\0\attachWorldModelOffsetRoll6\0\attachWorldModelOffsetPitch7\0\attachWorldModelOffsetYaw7\0\attachWorldModelOffsetRoll7\0\attachWorldModelOffsetPitch8\0\attachWorldModelOffsetYaw8\0\attachWorldModelOffsetRoll8\0\ignoreAttachments\0\stowedModelOffsetsF\6.88\stowedModelOffsetsR\0.72\stowedModelOffsetsU\3.51\stowedModelOffsetsPitch\0\stowedModelOffsetsYaw\0\stowedModelOffsetsRoll\0\worldClipModel\t6_attach_mag_pdw57_world\rocketModel\\mountedModel\\AdditionalMeleeModel\\fireTypeIcon\hud_mp_firerate_auto\hudIcon\menu_mp_weapons_ar57\hudIconRatio\2:1\indicatorIcon\\indicatorIconRatio\1:1\ammoCounterIcon\menu_mp_weapons_ar57\ammoCounterIconRatio\1:1\ammoCounterClip\Magazine\startAmmo\4\ammoDisplayName\\ammoName\5.7x28mm ar57\clipName\ar57\maxAmmo\8\clipSize\50\shotCount\1\sharedAmmoCapName\\sharedAmmoCap\0\unlimitedAmmo\0\ammoCountClipRelative\1\sharedAmmo\0\jamFireTime\0.05\overheatWeapon\0\overheatRate\20\cooldownRate\15\overheatEndVal\25\coolWhileFiring\0\fuelTankWeapon\0\tankLifeTime\0\damage\35\minDamage\18\maxDamageRange\425\minDamageRange\1351\damage2\33\damage3\33\damage4\22\damage5\22\damageRange2\426\damageRange3\1000\damageRange4\1001\damageRange5\1350\damageDuration\0\damageInterval\0\playerDamage\70\meleeDamage\25\minPlayerDamage\0\destabilizationRateTime\0\destabilizationCurvatureMax\0\destabilizeDistance\0\fireDelay\0\meleeDelay\0.25\meleeChargeDelay\0\spinUpTime\1\spinDownTime\1\spinRate\1\spinLoopSound\\spinLoopSoundPlayer\\startSpinSound\\startSpinSoundPlayer\\stopSpinSound\\stopSpinSoundPlayer\\applySpinPitch\1\introFireTime\0.1\introFireLength\0\fireTime\0.08\flourishTime\0.08\lastFireTime\0\rechamberTime\0.1\rechamberBoltTime\0\holdFireTime\0.1\burstFireDelay\0\detonateTime\0\detonateDelay\0\meleeTime\0.7\meleeChargeTime\0\reloadTime\2.6\reloadShowRocketTime\0\reloadEmptyTime\3.2\reloadAddTime\1.7\reloadEmptyAddTime\0\reloadQuickAddTime\1.05\reloadQuickEmptyAddTime\0\reloadStartTime\0\reloadStartAddTime\0\reloadEndTime\0\reloadQuickTime\2.6\reloadQuickEmptyTime\3.2\dropTime\0.35\raiseTime\0.5\altDropTime\0\altRaiseTime\0\quickDropTime\0.25\quickRaiseTime\0.3\firstRaiseTime\1.25\emptyRaiseTime\0.7\emptyDropTime\0.7\sprintInTime\0.15\sprintLoopTime\0.7\sprintOutTime\0.2\lowReadyInTime\0.5\lowReadyLoopTime\0.5\lowReadyOutTime\0.3\contFireInTime\0.5\contFireLoopTime\0.5\contFireOutTime\0.5\dtpInTime\0.15\dtpLoopTime\0.6\dtpOutTime\0.25\crawlInTime\0.3\crawlForwardTime\1.1\crawlBackTime\1\crawlRightTime\1.2\crawlLeftTime\1.1\crawlOutFireTime\0.036\crawlOutTime\0.1\slideInTime\0.5\deployTime\0.5\breakdownTime\0.5\nightVisionWearTime\0\nightVisionWearTimeFadeOutEnd\0\nightVisionWearTimePowerUp\0\nightVisionRemoveTime\0\nightVisionRemoveTimePowerDown\0\nightVisionRemoveTimeFadeInStart\0\fuseTime\0\aifuseTime\0\lockOnRadius\0\lockOnSpeed\0\requireLockonToFire\0\noAdsWhenMagEmpty\0\avoidDropCleanup\0\stackFire\0\stackFireSpread\0\stackFireAccuracyDecay\0\stackSound\\autoAimRange\0\aimAssistRange\750\aimAssistRangeAds\1000\mountableWeapon\0\aimPadding\0\enemyCrosshairRange\1000\crosshairColorChange\1\moveSpeedScale\1\adsMoveSpeedScale\2\sprintDurationScale\1\idleCrouchFactor\0.75\idleProneFactor\0.4\gunMaxPitch\6\gunMaxYaw\6\swayMaxAngle\5\swayLerpSpeed\6\swayPitchScale\-1.5\swayYawScale\-1\swayHorizScale\0.25\swayVertScale\0.3\swayShellShockScale\0.1\adsSwayMaxAngle\0.6\adsSwayLerpSpeed\5.5\adsSwayPitchScale\0.125\adsSwayYawScale\0.125\adsSwayHorizScale\0.125\adsSwayVertScale\0.125\meleeChargeRange\0\rifleBullet\0\armorPiercing\0\boltAction\0\shotsBeforeRechamber\0\useAltTagFlash\0\useAntiLagRewind\0\isCarriedKillstreakWeapon\0\aimDownSight\1\rechamberWhileAds\1\reloadWhileAds\0\adsViewErrorMin\0\adsViewErrorMax\0\clipOnly\0\canUseInVehicle\0\noDropsOrRaises\0\cookOffHold\0\adsFire\0\cancelAutoHolsterWhenEmpty\0\suppressAmmoReserveDisplay\0\laserSight\0\laserSightDuringNightvision\0\bayonet\0\dualWield\0\hideThirdPerson\0\explodeOnGround\0\throwBack\0\retrievable\0\dieOnRespawn\0\noThirdPersonDropsOrRaises\0\continuousFire\0\useAsMelee\0\antiQuickScope\0\noPing\0\forceBounce\0\useDroppedModelAsStowed\0\noQuickDropWhenEmpty\0\keepCrosshairWhenADS\0\useOnlyAltWeaoponHideTagsInAltMode\0\altWeaponAdsOnly\0\altWeaponDisableSwitching\0\killIcon\menu_mp_weapons_ar57\killIconRatio\2:1\flipKillIcon\1\dpadIcon\\dpadIconRatio\1:1\noAmmoOnDpadIcon\1\noPartialReload\0\segmentedReload\0\noADSAutoReload\0\reloadAmmoAdd\0\reloadStartAdd\0\attachmentUnique\\altWeapon\\DualWieldWeapon\\grenadeWeapon\\dropAmmoMin\1\dropAmmoMax\1\dropClipAmmoMin\0\dropClipAmmoMax\1000\blocksProne\0\silenced\0\dualMag\0\infrared\0\tvguided\0\airburstWeapon\0\perks1\0\perks0\0\isRollingGrenade\0\useBallisticPrediction\0\isValuable\0\isTacticalInsertion\0\isReviveWeapon\0\bUseRigidBodyOnVehicle\0\showIndicator\0\explosionRadius\0\explosionRadiusMin\0\indicatorRadius\0\explosionInnerDamage\0\explosionOuterDamage\0\damageConeAngle\180\projectileSpeed\0\projectileSpeedRelativeUp\0\projectileSpeedUp\0\projectileSpeedForward\0\projectileTakeParentVel\0\projectileActivateDist\0\projectileLifetime\0\timeToAccelerate\0\projectileCurvature\0\projectileModel\\projExplosionType\grenade\projExplosionEffect\\projExplosionEffectForceNormalUp\0\projExplosionEffect2\\projExplosionEffect2ForceNormalUp\0\projExplosionEffect3\\projExplosionEffect3ForceNormalUp\0\projExplosionEffect4\\projExplosionEffect4ForceNormalUp\0\projExplosionEffect5\\projExplosionEffect5ForceNormalUp\0\projExplosionSound\\projDudEffect\\projDudSound\\projImpactExplode\0\sentientImpactExplode\0\explodeWhenStationary\0\bulletImpactExplode\0\mortarShellSound\\tankShellSound\\stickiness\Don't stick\rotateType\Rotate both axis, grenade style\hasDetonator\0\plantable\0\timedDetonation\0\noCrumpleMissile\0\rotate\0\keepRolling\0\holdButtonToThrow\0\offhandHoldIsCancelable\0\freezeMovementWhenFiring\0\lowAmmoWarningThreshold\0.33\explosionTag\\bDisallowAtMatchStart\0\isCameraSensor\0\isAcousticSensor\0\isLaserSensor\0\isHoldUseGrenade\0\parallelDefaultBounce\0\parallelAsphaltBounce\0\parallelBarkBounce\0\parallelBrickBounce\0\parallelCarpetBounce\0\parallelCeramicBounce\0\parallelClothBounce\0\parallelConcreteBounce\0\parallelCushionBounce\0\parallelDirtBounce\0\parallelFleshBounce\0\parallelFoliageBounce\0\parallelFruitBounce\0\parallelGlassBounce\0\parallelGrassBounce\0\parallelGravelBounce\0\parallelIceBounce\0\parallelMetalBounce\0\parallelMudBounce\0\parallelPaintedMetalBounce\0\parallelPaperBounce\0\parallelPlasterBounce\0\parallelPlasticBounce\0\parallelRockBounce\0\parallelRubberBounce\0\parallelSandBounce\0\parallelSnowBounce\0\parallelWaterBounce\0\parallelWoodBounce\0\parallelRiotShieldBounce\0\perpendicularDefaultBounce\0\perpendicularAsphaltBounce\0\perpendicularBarkBounce\0\perpendicularBrickBounce\0\perpendicularCarpetBounce\0\perpendicularCeramicBounce\0\perpendicularClothBounce\0\perpendicularConcreteBounce\0\perpendicularCushionBounce\0\perpendicularDirtBounce\0\perpendicularFleshBounce\0\perpendicularFoliageBounce\0\perpendicularFruitBounce\0\perpendicularGlassBounce\0\perpendicularGrassBounce\0\perpendicularGravelBounce\0\perpendicularIceBounce\0\perpendicularMetalBounce\0\perpendicularMudBounce\0\perpendicularPaintedMetalBounce\0\perpendicularPaperBounce\0\perpendicularPlasterBounce\0\perpendicularPlasticBounce\0\perpendicularRockBounce\0\perpendicularRubberBounce\0\perpendicularSandBounce\0\perpendicularSnowBounce\0\perpendicularWaterBounce\0\perpendicularWoodBounce\0\perpendicularRiotShieldBounce\0\projTrailEffect\\projectileRed\0\projectileGreen\0\projectileBlue\0\guidedMissileType\None\maxSteeringAccel\0\projIgnitionDelay\0\projIgnitionEffect\\projIgnitionSound\\tagFx_preparationEffect\\tagFlash_preparationEffect\\adsTransInTime\0.2\adsTransOutTime\0.2\adsIdleAmount\10\adsIdleSpeed\4\adsZoomFov1\55\adsZoomFov2\55\adsZoomFov3\55\adsZoomInFrac\0.7\adsZoomOutFrac\0.4\adsOverlayShader\\adsOverlayShaderLowRes\\adsOverlayReticle\none\adsOverlayInterface\None\adsOverlayWidth\480\adsOverlayHeight\480\adsOverlayAlphaScale\1\adsBobFactor\0.7\adsViewBobMult\0.2\holdBreathToSteady\0\adsAimPitch\0\adsCrosshairInFrac\1\adsCrosshairOutFrac\0.2\adsReloadTransTime\0.25\adsGunKickReducedKickBullets\0\adsGunKickReducedKickPercent\70\adsGunKickPitchMin\-10\adsGunKickPitchMax\10\adsGunKickYawMin\-5\adsGunKickYawMax\5\adsGunKickAccel\800\adsGunKickSpeedMax\2000\adsGunKickSpeedDecay\32\adsGunKickStaticDecay\40\adsViewKickPitchMin\-35\adsViewKickPitchMax\62.5\adsViewKickMinMagnitude\30\adsViewKickYawMin\-61\adsViewKickYawMax\31\adsRecoilReductionRate\0\adsRecoilReductionLimit\0\adsRecoilReturnRate\1\adsViewKickCenterSpeed\1300\adsViewKickCenterDuckedScale\1\adsViewKickCenterProneScale\1\adsSpread\0.3\antiQuickScopeTime\0.15\antiQuickScopeScale\8\antiQuickScopeSpreadMultiplier\1\antiQuickScopeSpreadMax\25\antiQuickScopeSwayFactor\20\hipSpreadStandMin\3\hipSpreadDuckedMin\1.75\hipSpreadProneMin\1.5\hipSpreadMax\6\hipSpreadDuckedMax\5\hipSpreadProneMax\4\hipSpreadDecayRate\4\hipSpreadFireAdd\0.6\hipSpreadTurnAdd\0\hipSpreadMoveAdd\5\hipSpreadDuckedDecay\1.05\hipSpreadProneDecay\1.1\hipReticleSidePos\0\hipIdleAmount\15\hipIdleSpeed\5\hipGunKickReducedKickBullets\0\hipGunKickReducedKickPercent\0\hipGunKickPitchMin\-25\hipGunKickPitchMax\25\hipGunKickYawMin\-25\hipGunKickYawMax\25\hipGunKickAccel\1000\hipGunKickSpeedMax\2000\hipGunKickSpeedDecay\16\hipGunKickStaticDecay\20\hipViewKickPitchMin\-35\hipViewKickPitchMax\60\hipViewKickMinMagnitude\0\hipViewKickYawMin\-60\hipViewKickYawMax\30\hipViewKickCenterSpeed\1300\leftArc\0\rightArc\0\topArc\0\bottomArc\0\accuracy\0\aiSpread\0\playerSpread\0\maxVertTurnSpeed\0\maxHorTurnSpeed\0\minVertTurnSpeed\0\minHorTurnSpeed\0\pitchConvergenceTime\0\yawConvergenceTime\0\suppressionTime\0\maxRange\0\animHorRotateInc\0\playerPositionDist\0\stance\stand\useHintString\\dropHintString\\horizViewJitter\0\vertViewJitter\0\cameraShakeScale\0\cameraShakeDuration\0\cameraShakeRadius\0\explosionCameraShakeScale\0\explosionCameraShakeDuration\0\explosionCameraShakeRadius\0\fightDist\720\maxDist\590\aiVsAiAccuracyGraph\\aiVsPlayerAccuracyGraph\\locNone\1\locHelmet\1\locHead\1.1\locNeck\1\locTorsoUpper\1\locTorsoMid\1\locTorsoLower\1\locRightArmUpper\1\locRightArmLower\1\locRightHand\1\locLeftArmUpper\1\locLeftArmLower\1\locLeftHand\1\locRightLegUpper\1\locRightLegLower\1\locRightFoot\1\locLeftLegUpper\1\locLeftLegLower\1\locLeftFoot\1\locGun\0\fireRumble\assault_fire\meleeImpactRumble\\reloadRumble\\explosionRumble\\tracerType\smg\enemyTracerType\smg_enemy\adsDofStart\2.3\adsDofEnd\3.5\scanSpeed\0\scanAccel\0\scanPauseTime\0\flameTableFirstPerson\\flameTableThirdPerson\\mmsWeapon\0\mmsInScope\0\mmsFOV\25\mmsAspect\1\mmsMaxDist\1200\ikLeftHandIdlePosF\0\ikLeftHandIdlePosR\0\ikLeftHandIdlePosU\0\ikLeftHandOffsetF\0\ikLeftHandOffsetR\0\ikLeftHandOffsetU\0\ikLeftHandRotationP\0\ikLeftHandRotationY\0\ikLeftHandRotationR\0\usingLeftHandProneIK\1\ikLeftHandProneOffsetF\0\ikLeftHandProneOffsetR\0.9\ikLeftHandProneOffsetU\0\ikLeftHandProneRotationP\0\ikLeftHandProneRotationY\0\ikLeftHandProneRotationR\0\ikLeftHandUiViewerOffsetF\-1\ikLeftHandUiViewerOffsetR\0\ikLeftHandUiViewerOffsetU\0\ikLeftHandUiViewerRotationP\1\ikLeftHandUiViewerRotationY\0\ikLeftHandUiViewerRotationR\0\parentWeaponName\pdw57\doGibbing\0\maxGibDistance\1000\altScopeADSTransInTime\0\altScopeADSTransOutTime\0\meleeSwipeEffect\\meleeImpactEffect\\meleeImpactNoBloodEffect\\throwBackType\\camo\camo_pdw57\customFloat0\0\customFloat1\0\customFloat2\0\customBool0\0\customBool1\0\customBool2\0\attachments\defaultattachment +silencer_smg\attachmentUniques\au_pdw57_none +au_pdw57_silencer \ No newline at end of file diff --git a/test/ObjLoadingTests/Game/T6/Weapon/silencer_smg b/test/ObjLoadingTests/Game/T6/Weapon/silencer_smg new file mode 100644 index 00000000..117075c1 --- /dev/null +++ b/test/ObjLoadingTests/Game/T6/Weapon/silencer_smg @@ -0,0 +1 @@ +ATTACHMENTFILE\displayName\WEAPON_SILENCER\attachmentType\silencer\penetrateType\none\firstRaisePriority\1\hipIdleAmount\0\fireType\Full Auto\damageRangeScale\0.7\adsZoomFov1\1\adsZoomFov2\1\adsZoomFov3\1\adsZoomInFrac\0\adsZoomOutFrac\0\adsTransInTimeScale\1\adsTransOutTimeScale\1\adsRecoilReductionRate\0\adsRecoilReductionLimit\0\adsViewKickCenterSpeedScale\0.98\adsIdleAmountScale\1\swayOverride\0\swayMaxAngle\0\swayLerpSpeed\1\swayPitchScale\-2\swayYawScale\-2\swayHorizScale\-2\swayVertScale\-2\adsSwayOverride\0\adsSwayMaxAngle\0\adsSwayLerpSpeed\1\adsSwayPitchScale\-2\adsSwayYawScale\-2\adsSwayHorizScale\-2\adsSwayVertScale\-2\adsMoveSpeedScale\1\hipSpreadMinScale\1\hipSpreadMaxScale\1\strafeRotR\-300\standMoveF\-300\standRotP\-300\standRotY\0\standRotR\-300\fireTimeScale\1\reloadTimeScale\1\reloadEmptyTimeScale\1\reloadAddTimeScale\1\reloadQuickTimeScale\1\reloadQuickEmptyTimeScale\1\reloadQuickAddTimeScale\1\perks1\0\perks0\0\altWeaponAdsOnly\0\altWeaponDisableSwitching\0\altScopeADSTransInTime\0\altScopeADSTransOutTime\0\silenced\1\dualMag\0\laserSight\0\infrared\0\useAsMelee\0\dualWield\0\sharedAmmo\0\mmsWeapon\0\mmsInScope\0\mmsFOV\0\mmsAspect\0.33\mmsMaxDist\100\clipSizeScale\1\clipSize\10\stackFire\0\stackFireSpread\0\stackFireAccuracyDecay\0\customFloat0\0\customFloat1\0\customFloat2\0\customBool0\0\customBool1\0\customBool2\0 \ No newline at end of file