diff --git a/EndlessVendetta/Config/DefaultGame.ini b/EndlessVendetta/Config/DefaultGame.ini
index 5e30bff6..62a7558d 100644
--- a/EndlessVendetta/Config/DefaultGame.ini
+++ b/EndlessVendetta/Config/DefaultGame.ini
@@ -116,8 +116,8 @@ PerPlatformTargetFlavorName=(("Android", "Android_ASTC"))
PerPlatformBuildTarget=()
[/Script/AsyncLoadingScreen.LoadingScreenSettings]
-bPreloadBackgroundImages=False
-StartupLoadingScreen=(MinimumLoadingScreenDisplayTime=-1.000000,bAutoCompleteWhenLoadingCompletes=True,bMoviesAreSkippable=True,bWaitForManualStop=False,bAllowInEarlyStartup=False,bAllowEngineTick=False,PlaybackType=MT_Normal,MoviePaths=,bShuffle=False,bSetDisplayMovieIndexManually=False,bShowWidgetOverlay=False,bShowLoadingCompleteText=False,LoadingCompleteTextSettings=(LoadingCompleteText="",Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Normal",Size=24,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),Alignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),Padding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),bFadeInOutAnim=True,AnimationSpeed=1.000000),Background=(Images=,ImageStretch=ScaleToFit,Padding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),BackgroundColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000),bSetDisplayBackgroundManually=False),TipWidget=(TipText=,Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Normal",Size=20,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),TipWrapAt=1000.000000,bSetDisplayTipTextManually=False),LoadingWidget=(LoadingIconType=LIT_CircularThrobber,LoadingWidgetType=LWT_Horizontal,TransformTranslation=(X=0.000000,Y=0.000000),TransformScale=(X=1.000000,Y=1.000000),TransformPivot=(X=0.500000,Y=0.500000),LoadingText=NSLOCTEXT("AsyncLoadingScreen", "Loading", "LOADING"),bLoadingTextRightPosition=True,bLoadingTextTopPosition=True,Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Bold",Size=32,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),ThrobberSettings=(NumberOfPieces=3,bAnimateHorizontally=True,bAnimateVertically=True,bAnimateOpacity=True,Image=(bIsDynamicallyLoaded=False,DrawAs=Image,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=32.000000,Y=32.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=None,ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0))),CircularThrobberSettings=(NumberOfPieces=6,Period=0.750000,Radius=64.000000,Image=(bIsDynamicallyLoaded=False,DrawAs=Image,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=32.000000,Y=32.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=None,ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0))),ImageSequenceSettings=(Images=,Scale=(X=1.000000,Y=1.000000),Interval=0.050000,bPlayReverse=False),TextAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),LoadingIconAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),Space=1.000000,bHideLoadingWidgetWhenCompletes=False),Layout=ALSL_Classic)
+bPreloadBackgroundImages=True
+StartupLoadingScreen=(MinimumLoadingScreenDisplayTime=-1.000000,bAutoCompleteWhenLoadingCompletes=True,bMoviesAreSkippable=False,bWaitForManualStop=False,bAllowInEarlyStartup=False,bAllowEngineTick=False,PlaybackType=MT_Normal,MoviePaths=,bShuffle=False,bSetDisplayMovieIndexManually=False,bShowWidgetOverlay=False,bShowLoadingCompleteText=False,LoadingCompleteTextSettings=(LoadingCompleteText="",Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Normal",Size=24,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),Alignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),Padding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),bFadeInOutAnim=True,AnimationSpeed=1.000000),Background=(Images=,ImageStretch=ScaleToFit,Padding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),BackgroundColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000),bSetDisplayBackgroundManually=False),TipWidget=(TipText=,Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Normal",Size=20,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),TipWrapAt=1000.000000,bSetDisplayTipTextManually=False),LoadingWidget=(LoadingIconType=LIT_CircularThrobber,LoadingWidgetType=LWT_Horizontal,TransformTranslation=(X=0.000000,Y=0.000000),TransformScale=(X=1.000000,Y=1.000000),TransformPivot=(X=0.500000,Y=0.500000),LoadingText=NSLOCTEXT("AsyncLoadingScreen", "Loading", "LOADING"),bLoadingTextRightPosition=True,bLoadingTextTopPosition=True,Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Bold",Size=32,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),ThrobberSettings=(NumberOfPieces=3,bAnimateHorizontally=True,bAnimateVertically=True,bAnimateOpacity=True,Image=(bIsDynamicallyLoaded=False,DrawAs=Image,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=32.000000,Y=32.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=None,ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0))),CircularThrobberSettings=(NumberOfPieces=6,Period=0.750000,Radius=64.000000,Image=(bIsDynamicallyLoaded=False,DrawAs=Image,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=32.000000,Y=32.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=None,ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0))),ImageSequenceSettings=(Images=,Scale=(X=1.000000,Y=1.000000),Interval=0.050000,bPlayReverse=False),TextAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),LoadingIconAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),Space=1.000000,bHideLoadingWidgetWhenCompletes=False),Layout=ALSL_Classic)
DefaultLoadingScreen=(MinimumLoadingScreenDisplayTime=-1.000000,bAutoCompleteWhenLoadingCompletes=True,bMoviesAreSkippable=True,bWaitForManualStop=False,bAllowInEarlyStartup=False,bAllowEngineTick=False,PlaybackType=MT_Normal,MoviePaths=,bShuffle=False,bSetDisplayMovieIndexManually=False,bShowWidgetOverlay=True,bShowLoadingCompleteText=False,LoadingCompleteTextSettings=(LoadingCompleteText="",Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Normal",Size=24,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),Alignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),Padding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),bFadeInOutAnim=True,AnimationSpeed=1.000000),Background=(Images=("/Game/BountySystem/LoadingScreen/BruhMoment.BruhMoment"),ImageStretch=Fill,Padding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),BackgroundColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000),bSetDisplayBackgroundManually=False),TipWidget=(TipText=,Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Normal",Size=20,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),TipWrapAt=1000.000000,bSetDisplayTipTextManually=False),LoadingWidget=(LoadingIconType=LIT_Throbber,LoadingWidgetType=LWT_Horizontal,TransformTranslation=(X=0.000000,Y=0.000000),TransformScale=(X=1.000000,Y=1.000000),TransformPivot=(X=0.500000,Y=0.500000),LoadingText="",bLoadingTextRightPosition=False,bLoadingTextTopPosition=True,Appearance=(ColorAndOpacity=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),Font=(FontObject=/Script/Engine.Font'"/Engine/EngineFonts/Roboto.Roboto"',FontMaterial=None,OutlineSettings=(OutlineSize=0,bSeparateFillAlpha=False,bApplyOutlineToDropShadows=False,OutlineMaterial=None,OutlineColor=(R=0.000000,G=0.000000,B=0.000000,A=1.000000)),TypefaceFontName="Bold",Size=32,LetterSpacing=0,SkewAmount=0.000000),ShadowOffset=(X=0.000000,Y=0.000000),ShadowColorAndOpacity=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),Justification=Left),ThrobberSettings=(NumberOfPieces=5,bAnimateHorizontally=True,bAnimateVertically=True,bAnimateOpacity=True,Image=(bIsDynamicallyLoaded=False,DrawAs=Image,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=64.000000,Y=64.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=/Script/Engine.Texture2D'"/Game/BountySystem/LoadingScreen/Logo.Logo"',ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0))),CircularThrobberSettings=(NumberOfPieces=6,Period=0.750000,Radius=64.000000,Image=(bIsDynamicallyLoaded=False,DrawAs=Image,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=32.000000,Y=32.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=/Script/Engine.Texture2D'"/Game/BountySystem/LoadingScreen/Logo.Logo"',ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0))),ImageSequenceSettings=(Images=,Scale=(X=1.000000,Y=1.000000),Interval=0.050000,bPlayReverse=False),TextAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),LoadingIconAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),Space=1.000000,bHideLoadingWidgetWhenCompletes=False),Layout=ALSL_Classic)
Classic=(bIsWidgetAtBottom=True,bIsLoadingWidgetAtLeft=False,Space=1.000000,TipAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),BorderHorizontalAlignment=HAlign_Fill,BorderPadding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),BorderBackground=(bIsDynamicallyLoaded=False,DrawAs=NoDrawType,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=50000.000000,Y=50000.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=None,ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0)))
Center=(bIsTipAtBottom=True,TipAlignment=(HorizontalAlignment=HAlign_Center,VerticalAlignment=VAlign_Center),BorderHorizontalAlignment=HAlign_Fill,BorderVerticalOffset=0.000000,BorderPadding=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),BorderBackground=(bIsDynamicallyLoaded=False,DrawAs=Image,Tiling=NoTile,Mirroring=NoMirror,ImageType=NoImage,ImageSize=(X=32.000000,Y=32.000000),Margin=(Left=0.000000,Top=0.000000,Right=0.000000,Bottom=0.000000),TintColor=(SpecifiedColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),ColorUseRule=UseColor_Specified),OutlineSettings=(CornerRadii=(X=0.000000,Y=0.000000,Z=0.000000,W=1.000000),Color=(SpecifiedColor=(R=0.000000,G=0.000000,B=0.000000,A=0.000000),ColorUseRule=UseColor_Specified),Width=0.000000,RoundingType=HalfHeightRadius,bUseBrushTransparency=False),ResourceObject=None,ResourceName="",UVRegion=(Min=(X=0.000000,Y=0.000000),Max=(X=0.000000,Y=0.000000),bIsValid=0)))
diff --git a/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset b/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset
index 334e34e4..2dc6220b 100644
--- a/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset
+++ b/EndlessVendetta/Content/AI/UI_RestrictedZone.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d52432a75546b5ca8ca4dc44e23e8a569baec228068cd27815259e8e1ef975f6
-size 51037
+oid sha256:c5e9f137a5e121059f12930393fcac91a2a9c5e8717a8dc2da9afba9ad4e5578
+size 51340
diff --git a/EndlessVendetta/Content/Assets/OpenWorld/Props/Sign02.uasset b/EndlessVendetta/Content/Assets/OpenWorld/Props/Sign02.uasset
index 7b15b71e..cfb4c37d 100644
--- a/EndlessVendetta/Content/Assets/OpenWorld/Props/Sign02.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Props/Sign02.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5815012969a62da5ca22ced281cd865100ed440e54b4701567311a585d387c88
-size 15258
+oid sha256:99affa317de6c2b2b246e4ec84fd9d8c08904a7e3799583571303e09340a7a0f
+size 15421
diff --git a/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign01.uasset b/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign01.uasset
index 805aac08..0232ef67 100644
--- a/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign01.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign01.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d699403156eca53ee386a9c99e737c09352ab9ac84d8b73030cc45b8a4df02b6
-size 19839
+oid sha256:97e62da89ff406dc2bfc178806a3bfcf97d03f18a87913f1879e9a4ae9739a52
+size 19709
diff --git a/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign2_Blueprint.uasset b/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign2_Blueprint.uasset
index 74bffa9c..2609de8a 100644
--- a/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign2_Blueprint.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign2_Blueprint.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:77a091fddf36ee85c49c6ebc6272af75fda2c37822fee7b166a5f1df1e46743c
-size 35819
+oid sha256:584a497248400f4fa9a8207b403b8a931b464fa689ed0c0662c1ef2cd92239fe
+size 35825
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Boy_that_wold_be_a_too_long_a_conversation_for_me.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Boy_that_wold_be_a_too_long_a_conversation_for_me.uasset
index 7e16aed5..10493ce7 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Boy_that_wold_be_a_too_long_a_conversation_for_me.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Boy_that_wold_be_a_too_long_a_conversation_for_me.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8eff17e1c293ac557b59cb5eaeed3e68185017e2bb5d0c7b36a0848c29233bbf
-size 444970
+oid sha256:8dbdf677d72fc79ff4348bdbfd524a12a88563412d69cf7079e69fd26cc2e7ce
+size 624366
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Depends_what_it_is__Fire_away.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Depends_what_it_is__Fire_away.uasset
index 3491cc11..fe83bc57 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Depends_what_it_is__Fire_away.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Depends_what_it_is__Fire_away.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e232ba23d8d1cb79fc9172fcc98e7b8c81ed3d7ba4034aa9f2923134f2450364
-size 124280
+oid sha256:cb6939a09df9545a37f9710fa5bd5728bc01a2cdae6efbe6d396b5543bc6b029
+size 185553
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Every_ship_has_a_faulty_airlock.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Every_ship_has_a_faulty_airlock.uasset
index c6d67280..94e36f6d 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Every_ship_has_a_faulty_airlock.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Every_ship_has_a_faulty_airlock.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bb5bc3536c9ce7a73ee81143bfda424e2d2a77b06f311d6dedc6857c4a424628
-size 646996
+oid sha256:a6e8072c04b94b372e4766ad508ce634bf2d2cb2e266acc78335af650a2beccb
+size 1021125
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Exactly__WE_ALL_GET_A_BIT_OF_MONEY.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Exactly__WE_ALL_GET_A_BIT_OF_MONEY.uasset
index d0370cd0..ff37c7b7 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Exactly__WE_ALL_GET_A_BIT_OF_MONEY.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Exactly__WE_ALL_GET_A_BIT_OF_MONEY.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5c0b79f3dce34d844d6e741038437f4aae317b415f4d5547e9f10a363a2d0857
-size 261080
+oid sha256:3668b27adf52d7037f5cfc023992432042c7613b7be1dde87fe4df34254dcf4c
+size 413691
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/I_dont_hate_earth_im_earth_brone_but_its_tainted.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/I_dont_hate_earth_im_earth_brone_but_its_tainted.uasset
index 8e933f84..0da61b44 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/I_dont_hate_earth_im_earth_brone_but_its_tainted.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/I_dont_hate_earth_im_earth_brone_but_its_tainted.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7b7f0daf4e9fe85455d4bf7f6e53755f1f6d0c70c89b2523a36804aca4b7b583
-size 1083416
+oid sha256:897b1ea8644aa328d0405be95f77564a911859eaa65aaa620372ac1ea7936a7c
+size 1534638
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Interesting_how_you_ll_just_insult_your_potential_employer_with_such_outreagous_claims.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Interesting_how_you_ll_just_insult_your_potential_employer_with_such_outreagous_claims.uasset
index 3b13f8d2..49984c3b 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Interesting_how_you_ll_just_insult_your_potential_employer_with_such_outreagous_claims.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Interesting_how_you_ll_just_insult_your_potential_employer_with_such_outreagous_claims.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d855a6b2acbf6b94ec11ab6554ccb7befc2fa35e9c42a7c4b57a14d21192ae80
-size 799618
+oid sha256:dec786d5be758c4d1b90b4c90292dee5b6e9c24a5265d138701d165484ac29f3
+size 1241029
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/NO_youre_the_first_I_have_had_to_hire.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/NO_youre_the_first_I_have_had_to_hire.uasset
index 65446a95..7a809fa8 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/NO_youre_the_first_I_have_had_to_hire.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/NO_youre_the_first_I_have_had_to_hire.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:149164cf4226b9c387b6f178d661b119e07ab36d42d1b09caa18c08a190a9e7f
-size 493806
+oid sha256:913d15fbf0878a65cbc0969902ad5a6ec9fa2bff20f3b835fb15f182fe64bed3
+size 765880
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Nah__this_is_one_of_the_facilities_where.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Nah__this_is_one_of_the_facilities_where.uasset
index cc267b73..14826fb7 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Nah__this_is_one_of_the_facilities_where.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Nah__this_is_one_of_the_facilities_where.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c8f1515249c772f2cd483dc0920bd14561599da7b339a2c9c5a8671a17b0786e
-size 313746
+oid sha256:52f59e5772d259b5e6520126b401aff2f338261c02b396bc14b5047bf6ce833e
+size 464628
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Not_everyone_would_agree_to_being_buddy_buddy.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Not_everyone_would_agree_to_being_buddy_buddy.uasset
index f6b8168d..9495b5ab 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Not_everyone_would_agree_to_being_buddy_buddy.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Not_everyone_would_agree_to_being_buddy_buddy.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9c7d1b3ad95072a3fab4b027373146f23c355d5a1ec8360e308a1e1ae2c3dad5
-size 595058
+oid sha256:629c387c2e3d0f1883f32f5546da4c1375fd889edf6047a0d48684faadc8605d
+size 952156
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well_I_guess_we_re_gonna_see_if_youre_as_skilled.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well_I_guess_we_re_gonna_see_if_youre_as_skilled.uasset
index d2851c58..1b14affd 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well_I_guess_we_re_gonna_see_if_youre_as_skilled.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well_I_guess_we_re_gonna_see_if_youre_as_skilled.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7f8e1cda4c42715c206cdabd4d012e31fc9971382d9428e529bded03e62eb97f
-size 304461
+oid sha256:9612fee86fb70369c07ef77c1e8f913a322701f27095ece37f70818a26aee713
+size 438675
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well__as_the_mayor__the_top_of_the_command.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well__as_the_mayor__the_top_of_the_command.uasset
index 0edaf8f6..bc0fe7b8 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well__as_the_mayor__the_top_of_the_command.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Well__as_the_mayor__the_top_of_the_command.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ea26dcb0e9074b9fbdfa53ae6a543b51b04614f099790ddcb1fe3fef17052c11
-size 756737
+oid sha256:a0c172ec083989b16a8dabf73af9dc5196d2b88251db5c84ce237d20d41c3e4a
+size 1150131
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Youre_lucky_youre_good_at_what_you_do.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Youre_lucky_youre_good_at_what_you_do.uasset
index f05547a6..d6716635 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Youre_lucky_youre_good_at_what_you_do.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/Youre_lucky_youre_good_at_what_you_do.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4b1d86e3814b325a7d9fbd1c59677f95113d5ab00596c30150b177b78ad0010d
-size 279319
+oid sha256:a3b09f29afa86ca2b833d24c065f69e5261b9dd9535c9eda2adee47107eef59f
+size 430962
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/im_in_the_martian_party__i_truly.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/im_in_the_martian_party__i_truly.uasset
index 5eb6458b..a660a848 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/im_in_the_martian_party__i_truly.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/im_in_the_martian_party__i_truly.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:75e6046bcb2cdf1e869aca1423b644f8e99944ff3a12e956b85f7a2b3209bdff
-size 216275
+oid sha256:6716f39d5207193c6bb1fb79bfa63a0aebbc3ea0884bf2045937281fbf71e1da
+size 305759
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/they_oversaw_civil_affairs_in_warsaw.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/they_oversaw_civil_affairs_in_warsaw.uasset
index ce7eb4a7..d8361c69 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/they_oversaw_civil_affairs_in_warsaw.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/they_oversaw_civil_affairs_in_warsaw.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c4b3da7106c775f26421dbd3c512112db52f7837dcaac3d23e48189771d6f396
-size 603850
+oid sha256:f594c67168d41cf09fe01e1ea05626cda039d4ac1e7d65d35dd4a739611946cb
+size 844332
diff --git a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/well_my_parents_were_politions_on_earth_but_they_couldn_see_the_future.uasset b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/well_my_parents_were_politions_on_earth_but_they_couldn_see_the_future.uasset
index 73d0a3e0..ab9d897e 100644
--- a/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/well_my_parents_were_politions_on_earth_but_they_couldn_see_the_future.uasset
+++ b/EndlessVendetta/Content/Audio/Dialogue/Mayor_Philip/Dialog_tree/well_my_parents_were_politions_on_earth_but_they_couldn_see_the_future.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8f77ff9a9513a1a0dd9c96d880f132d1b19b1ef7068cbf0569e0468d5d3c57b5
-size 557171
+oid sha256:111a1b483d5eac80ff16d226ad200a2395618d8f1e3d518196ffa16888bbe2e8
+size 798466
diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/ConstructionWorker/DT_ConstructionWorker.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/ConstructionWorker/DT_ConstructionWorker.uasset
index 8c4705f2..b30b3f1c 100644
--- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/ConstructionWorker/DT_ConstructionWorker.uasset
+++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/ConstructionWorker/DT_ConstructionWorker.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1601f030eac7b4dceecb08b62ff7657c5170e30c0879afe48307f6aa1519ec9e
-size 17402
+oid sha256:73742e8d3f26c62bc8d19a7b1593c1de4e88a0659a5186dcbf2961fe07454774
+size 17998
diff --git a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset
index a2404eb1..5459a4a0 100644
--- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset
+++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1dccc4b8766593fd397bac0922b456dc6bfd01e19a0d5eae33026badd7455b00
-size 128098
+oid sha256:40a3d90681a245519ffa3efa1c19c506e4fcc379d40905a1cabab4b2fd2d1736
+size 137641
diff --git a/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset b/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset
index 2345cd71..0fb8ad3f 100644
--- a/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset
+++ b/EndlessVendetta/Content/Dialogue/D_ApartmentLobbySecurity.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2e3f03247ea995690279ab71c6af13f65e8a1ac82ce67ed129259e0619c50ee4
-size 32655
+oid sha256:04f84b3cc08dea13d77d4d958b2f479ae8610050001b7a3a127fc44324fe7c25
+size 34506
diff --git a/EndlessVendetta/Content/Dialogue/D_DrugFiend.uasset b/EndlessVendetta/Content/Dialogue/D_DrugFiend.uasset
new file mode 100644
index 00000000..e333ea73
--- /dev/null
+++ b/EndlessVendetta/Content/Dialogue/D_DrugFiend.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:088962b771234949aa2f6923247db18d5d0f6932099b7921d7a397d24687f757
+size 61578
diff --git a/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset
index ec3889de..242b2e72 100644
--- a/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset
+++ b/EndlessVendetta/Content/Dialogue/D_Mayor_Tutorial.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:060781c3eda905eb75e12ff506412383129429dbf664aff0c903e8a2965dfa82
-size 90113
+oid sha256:3066f88d5ae5c4429d74de45d996feaf500e73249a5c2a737f305af68c08ac40
+size 94928
diff --git a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset
index f8d0b0f4..7f35d98f 100644
--- a/EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset
+++ b/EndlessVendetta/Content/Dialogue/Testing/TestDialogueCube.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:60ca28d8ea931aac38d3b1af2a9047218386627a5abebddb6f886ab4a10b2866
-size 28365
+oid sha256:f92a91c32d0d52124b9a28619bcee6f232b8033e42e873a80e06ee53f0be8e39
+size 28316
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset
index 518c53ee..e6bf2461 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:79812b300a5492136e269034cadf25a2ee84b9d9483d36a6a0f434f6b2880b64
-size 1871414
+oid sha256:af9dc6f67ddf04a49c549c90a8dca7391f7a704fbfba711f532d399e9c19ad5a
+size 1871298
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle_Skeleton.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle_Skeleton.uasset
index a6737d71..ad961f75 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle_Skeleton.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/AssaultRifle_Skeleton.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7c064b196738bf46558d2eae929d7f0b64d74a36c989c5b43cd94ec3af533f48
-size 7674
+oid sha256:825ba28072e7c0543c6d4acd14222404a73d3e6f4aa3d1e1540962039d374421
+size 8285
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset
index 423d22a5..4021dad8 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5b86e89395e8516d6bc4007084f4c04f231b30b48e411258b3b0629f6ead1f71
-size 146164
+oid sha256:eb337be8dced3c95715b4ec5aea6394bdeb4f4a256330a0b1fa16658c44e8f86
+size 144576
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset
index 25f3d88f..c17fcf86 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/BP_BasePistolWeapon_Animated.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c6f2fd505784df107ba2b52e6a554d8f074522408abd99e7c4e0d8e1fdb63081
-size 219045
+oid sha256:f2d95b940b89ced4dfbb4526ee5deff7e7c1a54f51cb4f500a9d474ce74a6b06
+size 219992
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol.uasset
index 94d5738d..f0a0ccfc 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8aad6513dafb2daf9c77cc9ffedead792f7ee4e22709ca20309d967f64ee1e7b
-size 935300
+oid sha256:a96b57f3b10f0057c069f3a18d8986b50380813b359deb91a932d453dfdafeab
+size 935417
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset
index cfe22307..f4efd301 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/Pistol_Skeleton.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bcd0987d98828fe75124f3bdbec4cb955591c45296cfb0a933d7b26f90542015
-size 9054
+oid sha256:7fe286bc1c2aad2487b5a16a7404f303f429583515ccbe698d1ccd06126d3d62
+size 9043
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
index daa31bc7..1bd0fcfd 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:649bbaeec1f17b7df76ca85f97bb654fd015f1f60ecc4ad609be522c8c84424d
-size 47984
+oid sha256:bb934fcb355d2488eac64deb309fc7f9c28dc480ef4c863e366f45505d5b783f
+size 48105
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
index 1c0cae2b..ec1dce73 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:698644a0e32468a5a14de2ac04f7eb1a4dcffe79834b0d798f252c8b1b3b439a
-size 190082
+oid sha256:43ea0ea95d9f308f2fa4e67daaa42bd158451859bfacee211310ba704899e377
+size 189333
diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
index fb68f124..5b577b4c 100644
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0c6965c12453ad31a81fd13b0ac2027c12614b5bf59fe1e66da0607c17bfa8a3
-size 545265
+oid sha256:bf0f43aaad74711468cff606f954166074ff5b7eb250167a4dd370577009f799
+size 595741
diff --git a/EndlessVendetta/Content/MainMenu/Widgets/MainMenuTitle.uasset b/EndlessVendetta/Content/MainMenu/Widgets/MainMenuTitle.uasset
index a19211a6..f8a6a90b 100644
--- a/EndlessVendetta/Content/MainMenu/Widgets/MainMenuTitle.uasset
+++ b/EndlessVendetta/Content/MainMenu/Widgets/MainMenuTitle.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a5419a9756f6352bdf3e467a2ab834ee014e7d4cdb74aac4a644c5ba2bff09cc
-size 359731
+oid sha256:bdcfd9271645e67826a00ea4e15cd5d3b6ee7a67486d8de86f0d9d649618cf4b
+size 375321
diff --git a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset
index a5d191cb..06a97069 100644
--- a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset
+++ b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2848f942161863cfbb6c7f66019127937bb0c23d2df764b10f96cb552f33de4f
-size 508713
+oid sha256:41bbf4884213d8e8c386eca5d6275d9ef63856e6078ea20db2d44695899688e6
+size 118652
diff --git a/EndlessVendetta/Content/SM_Suppresor.uasset b/EndlessVendetta/Content/SM_Suppresor.uasset
new file mode 100644
index 00000000..1b50713a
--- /dev/null
+++ b/EndlessVendetta/Content/SM_Suppresor.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc8678112ca4bc08d1509266c1dba93e93cfb7a5ea4e6117f05d64cdb468d941
+size 144711
diff --git a/EndlessVendetta/Content/Suppresor_low_Suppresor_BaseColor.uasset b/EndlessVendetta/Content/Suppresor_low_Suppresor_BaseColor.uasset
new file mode 100644
index 00000000..085d5a4e
--- /dev/null
+++ b/EndlessVendetta/Content/Suppresor_low_Suppresor_BaseColor.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06665efcd74ece207924dc9ec06d1160f511255c4e89ebb1b859cf105b776427
+size 731386
diff --git a/EndlessVendetta/Content/Suppresor_low_Suppresor_Normal.uasset b/EndlessVendetta/Content/Suppresor_low_Suppresor_Normal.uasset
new file mode 100644
index 00000000..c66b359c
--- /dev/null
+++ b/EndlessVendetta/Content/Suppresor_low_Suppresor_Normal.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3645a9086e2bbc927a02f3a10b76175a312fe632d21d8d2c1bb1bc71d38c860
+size 7452760
diff --git a/EndlessVendetta/Content/Suppresor_low_Suppresor_OcclusionRoughnessMetallic.uasset b/EndlessVendetta/Content/Suppresor_low_Suppresor_OcclusionRoughnessMetallic.uasset
new file mode 100644
index 00000000..1c2d36b3
--- /dev/null
+++ b/EndlessVendetta/Content/Suppresor_low_Suppresor_OcclusionRoughnessMetallic.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdcd346defa2e8e410698578230c937e58bbe87a1fe14f56488a91572cf74515
+size 2727480
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/5/SA/4PNH8ZJKK86J19YVDA7CI2.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/5/SA/4PNH8ZJKK86J19YVDA7CI2.uasset
new file mode 100644
index 00000000..d9d1999e
--- /dev/null
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/5/SA/4PNH8ZJKK86J19YVDA7CI2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:037bfaac4cecc1420df5a7c50d312f8cd05e2294cf9ae6a908c2767d0aadd094
+size 6686
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset
deleted file mode 100644
index 37afd1ee..00000000
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c88ad479bdb1d6689073094adadcb3321da0a0276b73cce94e1a98a4d9b9b18
-size 6664
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset
index 33a2f45f..4d7a786c 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:04320abc795d5f06d116c66dc63af2f3798abfe01eebd48bff4461e6065e6b6c
+oid sha256:e43d01f94b0d3dd1c1857c9b16536d8361f3820f23f6bb815a873aaf7f7775b5
size 6374
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/6/WO/6SPD0GKMZFJ321WMCKF2MP.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/6/WO/6SPD0GKMZFJ321WMCKF2MP.uasset
new file mode 100644
index 00000000..dd7992c0
--- /dev/null
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/6/WO/6SPD0GKMZFJ321WMCKF2MP.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6dfd499f8f2cda9ca0e9dc09042ae01c918687bfc3d3edd91a1f70c1446b294
+size 6368
diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/C/ZX/8GZK30F02QUUO234VY329I.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/C/ZX/8GZK30F02QUUO234VY329I.uasset
index cbaee68d..b6e93e6f 100644
--- a/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/C/ZX/8GZK30F02QUUO234VY329I.uasset
+++ b/EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/C/ZX/8GZK30F02QUUO234VY329I.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1b756deb65f3b33eafc76d89fa5d22954d727c0abba8921e0c882603d66208f6
-size 8031
+oid sha256:d9c84b88495f19366adb345ef9afda2e5f9640f0f7d4fa15c7342f4e66acdfed
+size 8005
diff --git a/EndlessVendetta/Content/standardSurface1.uasset b/EndlessVendetta/Content/standardSurface1.uasset
new file mode 100644
index 00000000..23a67d10
--- /dev/null
+++ b/EndlessVendetta/Content/standardSurface1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d2f94daaf9fa6d976691e50d2469cbe326331fcd3a28fd82750cbcad2f4a3bc
+size 13440
diff --git a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user b/EndlessVendetta/EndlessVendetta.sln.DotSettings.user
deleted file mode 100644
index 2b08f3a1..00000000
--- a/EndlessVendetta/EndlessVendetta.sln.DotSettings.user
+++ /dev/null
@@ -1,2 +0,0 @@
-
- C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr
\ No newline at end of file
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
index b5fae2c7..65ad145f 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
@@ -143,7 +143,7 @@ void ABountyHunterCharacter::BeginPlay()
}
}
}
- CreatePauseMenuTabs();
+ //CreatePauseMenuTabs();
}
void ABountyHunterCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent)
@@ -218,12 +218,12 @@ void ABountyHunterCharacter::TogglePauseMenu()
PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass, FName("PauseMenu"));
PauseMenu->UpdatePlayerStatistics(Money, Favours);
PauseMenu->AddToViewport(50);
- PauseMenu->OpenNewTab(BountiesTab);
- PauseMenu->OpenedBountiesTab.AddDynamic(this, &ABountyHunterCharacter::OpenBountiesTab);
- PauseMenu->OpenedFavoursTab.AddDynamic(this, &ABountyHunterCharacter::OpenFavoursTab);
- PauseMenu->OpenedNavigationTab.AddDynamic(this, &ABountyHunterCharacter::OpenNavigationTab);
- PauseMenu->OpenedSettingsTab.AddDynamic(this, &ABountyHunterCharacter::OpenSettingsTab);
- PauseMenu->OpenedQuitTab.AddDynamic(this, &ABountyHunterCharacter::OpenQuitTab);
+ // PauseMenu->OpenNewTab(BountiesTab);
+ // PauseMenu->OpenedBountiesTab.AddDynamic(this, &ABountyHunterCharacter::OpenBountiesTab);
+ // PauseMenu->OpenedFavoursTab.AddDynamic(this, &ABountyHunterCharacter::OpenFavoursTab);
+ // PauseMenu->OpenedNavigationTab.AddDynamic(this, &ABountyHunterCharacter::OpenNavigationTab);
+ // PauseMenu->OpenedSettingsTab.AddDynamic(this, &ABountyHunterCharacter::OpenSettingsTab);
+ // PauseMenu->OpenedQuitTab.AddDynamic(this, &ABountyHunterCharacter::OpenQuitTab);
PauseMenu->SetVisibility(ESlateVisibility::Visible);
PauseMenu->SetFocus();
}
diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
index 008db360..1523e867 100644
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
@@ -220,6 +220,7 @@ private:
void CreatePauseMenuTabs();
// Open or Close the Pause Menu, Defaults to Opening Bounty Tab
+ UFUNCTION(BlueprintCallable)
void TogglePauseMenu();
// Opens Bounties Tab
diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp
index 2e20ce29..3cd9ca8d 100644
--- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp
@@ -96,8 +96,11 @@ void UAC_PlayerDialogueInterpreter::NextDialogue()
CurrentTextNode = Cast(CurrentTextNode->ChildrenNodes[0]);
CurrentCharacterSpeaking = *GetCharacterSpeakingFromEnum(CurrentTextNode->DialogueCharacterSpeaking);
OnNextDialogue.Broadcast(CurrentTextNode);
- CurrentVoiceOverAudioComponent = UGameplayStatics::SpawnSound2D(
- GetWorld(), CurrentTextNode->DialogueVoiceOver, 1.f, 1.f, 0.f, nullptr, false, false);
+ if (IsValid(CurrentTextNode->DialogueVoiceOver))
+ {
+ CurrentVoiceOverAudioComponent = UGameplayStatics::SpawnSound2D(
+ GetWorld(), CurrentTextNode->DialogueVoiceOver, 1.f, 1.f, 0.f, nullptr, false, false);
+ }
CurrentChoiceNode = nullptr;
CurrentAddItemNode = nullptr;
}
@@ -129,6 +132,11 @@ void UAC_PlayerDialogueInterpreter::NextDialogue()
CurrentTextNode = Cast(CurrentAddItemNode->ChildrenNodes[0]);
CurrentCharacterSpeaking = *GetCharacterSpeakingFromEnum(CurrentTextNode->DialogueCharacterSpeaking);
OnNextDialogue.Broadcast(CurrentTextNode);
+ if (IsValid(CurrentTextNode->DialogueVoiceOver))
+ {
+ CurrentVoiceOverAudioComponent = UGameplayStatics::SpawnSound2D(
+ GetWorld(), CurrentTextNode->DialogueVoiceOver, 1.f, 1.f, 0.f, nullptr, false, false);
+ }
CurrentChoiceNode = nullptr;
CurrentAddItemNode = nullptr;
}
@@ -158,6 +166,11 @@ void UAC_PlayerDialogueInterpreter::MakeChoiceDialogue(const int Choice)
CurrentTextNode = Cast(CurrentChoiceNode->ChildrenNodes[Choice]);
CurrentCharacterSpeaking = *GetCharacterSpeakingFromEnum(CurrentTextNode->DialogueCharacterSpeaking);
OnNextDialogue.Broadcast(CurrentTextNode);
+ if (IsValid(CurrentTextNode->DialogueVoiceOver))
+ {
+ CurrentVoiceOverAudioComponent = UGameplayStatics::SpawnSound2D(
+ GetWorld(), CurrentTextNode->DialogueVoiceOver, 1.f, 1.f, 0.f, nullptr, false, false);
+ }
CurrentChoiceNode = nullptr;
}
else if (Cast(CurrentChoiceNode->ChildrenNodes[Choice]))
diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
index e7316d1a..41aa0ea4 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
@@ -490,6 +490,7 @@ void AEndlessVendettaCharacter::EquipPrimary()
//PrimaryWeapon->AttachToComponent(FirstPersonArms, AttachmentRules, FName("UnEquipGunSocket"));
PrimaryWeapon->SetActorHiddenInGame(true);
PrimaryWeapon->SetActorEnableCollision(false);
+ PrimaryWeapon->HideNeedReloadUI();
this->GetFirstPersonCameraComponent()->SetFieldOfView(90);
UE_LOG(LogTemp, Warning, TEXT("Primary Weapon Is Hidden: %hhd"), PrimaryWeapon->IsHidden());
PrimaryWeapon = nullptr;
@@ -533,13 +534,24 @@ void AEndlessVendettaCharacter::EquipPrimary()
//For when you already have all your weapons and ur switching with 1 and 2 or when your picking up a weapon with a weapon in hand
if (PrimaryWeaponClass != nullptr)
{
- GEngine->AddOnScreenDebugMessage(-1, 15.f, FColor::Green, TEXT("non ifstatement code running"));
- //PrimaryWeaponActor->AttachToComponent(FirstPersonArms, AttachmentRules, FName("GripPoint"));
+ int PreviousAmmoCount = -1;
+ if (PrimaryWeaponClass == PrimaryWeaponActor->GetClass())
+ {
+ PreviousAmmoCount = Cast(PrimaryWeaponActor)->currentAmmoCount;
+ }
HeldWeapon->SetChildActorClass(PrimaryWeaponClass);
+ if (PreviousAmmoCount >= 0)
+ {
+ Cast(HeldWeapon->GetChildActor())->currentAmmoCount = PreviousAmmoCount;
+ }
PrimaryWeaponActor = HeldWeapon->GetChildActor();
PrimaryWeapon = Cast(PrimaryWeaponActor);
PrimaryWeapon->SetActorHiddenInGame(false);
PrimaryWeapon->SetActorEnableCollision(false);
+ if (PrimaryWeapon->currentAmmoCount <= 0)
+ {
+ PrimaryWeapon->ShowNeedReloadUI();
+ }
//GetWorldTimerManager().ClearTimer(PrimaryWeapon->reloadTimerHandle);
bIsCurrentlyHoldingWeapon = true;
bHasRifle = true;
@@ -564,6 +576,7 @@ void AEndlessVendettaCharacter::EquipSecondary()
SecondaryWeapon->SetActorHiddenInGame(true);
SecondaryWeapon->SetActorEnableCollision(false);
this->GetFirstPersonCameraComponent()->SetFieldOfView(90);
+ SecondaryWeapon->HideNeedReloadUI();
UE_LOG(LogTemp, Warning, TEXT("Secondary Weapon Is Hidden: %hhd"), SecondaryWeapon->IsHidden());
//the nullptr makes it so we can unequip and requip the same weapon
SecondaryWeapon = nullptr;
@@ -599,10 +612,23 @@ void AEndlessVendettaCharacter::EquipSecondary()
}
if (SecondaryWeaponClass != nullptr)
{
+ int PreviousAmmoCount = -1;
+ if (SecondaryWeaponClass == SecondaryWeaponActor->GetClass())
+ {
+ PreviousAmmoCount = Cast(SecondaryWeaponActor)->currentAmmoCount;
+ }
HeldWeapon->SetChildActorClass(SecondaryWeaponClass);
+ if (PreviousAmmoCount >= 0)
+ {
+ Cast(HeldWeapon->GetChildActor())->currentAmmoCount = PreviousAmmoCount;
+ }
SecondaryWeaponActor = HeldWeapon->GetChildActor();
SecondaryWeapon = Cast(SecondaryWeaponActor);
SecondaryWeapon->SetActorHiddenInGame(false);
+ if (SecondaryWeapon->currentAmmoCount <= 0)
+ {
+ SecondaryWeapon->ShowNeedReloadUI();
+ }
bIsCurrentlyHoldingWeapon = true;
SetOverlayState(EOverlayState::Pistol);
GetWorldTimerManager().ClearTimer(SecondaryWeapon->reloadTimerHandle);
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Boy that wold be a too long a conversation for me.wav b/Voice Lines/Mayor Philip/Dialog tree/Boy that wold be a too long a conversation for me.wav
index 686619e0..2a5dba03 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Boy that wold be a too long a conversation for me.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Boy that wold be a too long a conversation for me.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4daa69815f2a459f75c89762b4b4de3c169b75824aa397b7ab0444ba8695827d
-size 1437232
+oid sha256:bafc60440f52cde7d9ed28d25257657fc5b4d65aef020ca7cc142a4f719e0ad3
+size 716840
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Depends what it is, Fire away.wav b/Voice Lines/Mayor Philip/Dialog tree/Depends what it is, Fire away.wav
index c8d1a87f..ec01ef08 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Depends what it is, Fire away.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Depends what it is, Fire away.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0f060e19a6793f8b0ce6354ef1ccc6fa787ed3a555a738d8d824d1484ed99b51
-size 409868
+oid sha256:f24c7b4bd6e80049dcd884ca46b8471b59a6086a9719889625712d28d5ec3618
+size 204136
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Every ship has a faulty airlock.wav b/Voice Lines/Mayor Philip/Dialog tree/Every ship has a faulty airlock.wav
index 51058dcb..0ad4f461 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Every ship has a faulty airlock.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Every ship has a faulty airlock.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:af6130fac2b53e61359a99ceb93e91a908b4060dff980c0672a3d2a780f2f30a
-size 2641346
+oid sha256:d53027d6c7c462377aa1b00a6d0e6b2af074a49ab3b6dddb9d0b24edcc93f8e7
+size 1317664
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Exactly, WE ALL GET A BIT OF MONEY.wav b/Voice Lines/Mayor Philip/Dialog tree/Exactly, WE ALL GET A BIT OF MONEY.wav
index dca5dd22..c893e068 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Exactly, WE ALL GET A BIT OF MONEY.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Exactly, WE ALL GET A BIT OF MONEY.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b681e426f0e3d4c3457bbb243bafb34d7ab9ebf38580849edd2d0efed23d8ec8
-size 980628
+oid sha256:d8a6e2e9cb90b395f402c0788bcc9141b8666b571d291cb57b071368617207c9
+size 488962
diff --git a/Voice Lines/Mayor Philip/Dialog tree/I dont hate earth im earth brone but its tainted.wav b/Voice Lines/Mayor Philip/Dialog tree/I dont hate earth im earth brone but its tainted.wav
index 42479e7f..2a39926f 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/I dont hate earth im earth brone but its tainted.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/I dont hate earth im earth brone but its tainted.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1870aae3c7243e77117778f0a5f89ab6e3fae9b170a600acb74f0f4a33f978f0
-size 3616328
+oid sha256:7e56867a8e0c3ba61ca8a8bdc2f078eeda697ed40ada0aca017d3d73f98b4f43
+size 1804224
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Interesting how you_ll just insult your potential employer with such outreagous claims.wav b/Voice Lines/Mayor Philip/Dialog tree/Interesting how you_ll just insult your potential employer with such outreagous claims.wav
index 45b7d137..b54cb638 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Interesting how you_ll just insult your potential employer with such outreagous claims.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Interesting how you_ll just insult your potential employer with such outreagous claims.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:47336e25ad98c1c617839c19d5ee89a039ede8898090c14f2a6a288d60aec421
-size 2969070
+oid sha256:d1f5edd4e2b722643875de218a9ab7a06c54c3ecc0587b2923aaf1624d94e308
+size 1481314
diff --git a/Voice Lines/Mayor Philip/Dialog tree/NO youre the first I have had to hire.wav b/Voice Lines/Mayor Philip/Dialog tree/NO youre the first I have had to hire.wav
index dbc2ca8e..63173b2b 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/NO youre the first I have had to hire.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/NO youre the first I have had to hire.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6a5ad2c5c4bc27cd1dcfa1453ea67f8dc039ba98be7b74a9dd3b532df99ace35
-size 1812820
+oid sha256:52545c7530f370d1999b9a84d3a45de8c981c90017e352e90f5a49708f93dce9
+size 904240
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Nah, this is one of the facilities where.wav b/Voice Lines/Mayor Philip/Dialog tree/Nah, this is one of the facilities where.wav
index f52d37f0..788bdd48 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Nah, this is one of the facilities where.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Nah, this is one of the facilities where.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:00d87d0e9e40a68c1cefbeee605384de2c831eb900cec6070af414d6c07933db
-size 1072682
+oid sha256:5fc5e6e6be9acf7a49829e4ff206c5b85d95ab1165f1c7edaa7d76720cbefd9d
+size 534910
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Not everyone would agree to being buddy buddy.wav b/Voice Lines/Mayor Philip/Dialog tree/Not everyone would agree to being buddy buddy.wav
index 714b6098..4e60f72c 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Not everyone would agree to being buddy buddy.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Not everyone would agree to being buddy buddy.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2015c0188ce7bc707e97d40b9d16b38b72825b72971e4aa1fe5355f243597af8
-size 2453550
+oid sha256:2f5ac06bee285e81b7afc94318922cc07af27148de2b7deb3bb6767c41677492
+size 1223984
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Well I guess we_re gonna see if youre as skilled.wav b/Voice Lines/Mayor Philip/Dialog tree/Well I guess we_re gonna see if youre as skilled.wav
index 67af1e96..29f2ffdd 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Well I guess we_re gonna see if youre as skilled.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Well I guess we_re gonna see if youre as skilled.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7abd20dc1f3b8ecc49abe7996228405d76aecc8aa1a23e175a253ec7fc744815
-size 952546
+oid sha256:afb8275e2737344593ee52a374607db68d1dba87aa707671a66754e87aba9060
+size 474980
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Well, as the mayor, the top of the command.wav b/Voice Lines/Mayor Philip/Dialog tree/Well, as the mayor, the top of the command.wav
index c3e26c04..84fbda4c 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Well, as the mayor, the top of the command.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Well, as the mayor, the top of the command.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:980fed5e3014e43f9007cdbdf8e1ed034c1e1604b04880f086f83a7790a5db14
-size 2784954
+oid sha256:933122b3ea6946dc76e236785fa229cce04665d8a8cb921913a9861cc3e9fd68
+size 1389354
diff --git a/Voice Lines/Mayor Philip/Dialog tree/Youre lucky youre good at what you do.wav b/Voice Lines/Mayor Philip/Dialog tree/Youre lucky youre good at what you do.wav
index 8ac17252..be13054c 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/Youre lucky youre good at what you do.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/Youre lucky youre good at what you do.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a29eebb5ff0e4817d30b7afd5ee74d19bd78547705a8de854c779b756012ec58
-size 1039540
+oid sha256:923190f8ec7f00daabd04a9e2b9eca9066bc18f28dda0b5740f263e20919b1a5
+size 518368
diff --git a/Voice Lines/Mayor Philip/Dialog tree/im in the martian party, i truly.wav b/Voice Lines/Mayor Philip/Dialog tree/im in the martian party, i truly.wav
index 3415646b..ade6b837 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/im in the martian party, i truly.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/im in the martian party, i truly.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c1fa67233cc3ce8d1de088aac80c769e808bfc84fb94e17837ee1e908278fbb0
-size 674994
+oid sha256:2dbf53bd4b5739f260a3b4b5e8678006141502abcb3d74ae0122e785b281e935
+size 336446
diff --git a/Voice Lines/Mayor Philip/Dialog tree/they oversaw civil affairs in warsaw.wav b/Voice Lines/Mayor Philip/Dialog tree/they oversaw civil affairs in warsaw.wav
index 62bcb9bc..21137284 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/they oversaw civil affairs in warsaw.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/they oversaw civil affairs in warsaw.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e33c1725eaa8bd2b9361d1e04b228ee536cfad960c0cc3082274e4b609c6f331
-size 1929182
+oid sha256:cdb8d3205211cf0db740ee4264d34a83b08920d8ee34a4672771dd32bf43af7e
+size 962304
diff --git a/Voice Lines/Mayor Philip/Dialog tree/well my parents were politions on earth but they couldn see the future.wav b/Voice Lines/Mayor Philip/Dialog tree/well my parents were politions on earth but they couldn see the future.wav
index 9136d1eb..c8dc6432 100644
--- a/Voice Lines/Mayor Philip/Dialog tree/well my parents were politions on earth but they couldn see the future.wav
+++ b/Voice Lines/Mayor Philip/Dialog tree/well my parents were politions on earth but they couldn see the future.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ed9b31ba8582ebdd9fda100a7a34122e15bea5f56a144706f65d76c04a7dbc4c
-size 1856368
+oid sha256:f4b5f270518c127920cd28180603c19dd03739a4b512778a967b5b8cd2dab8d2
+size 926038