Merge branch 'Main-Bounty-Update' into AI-n-Stuff

# Conflicts: # EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
2024-03-22 12:19:29 +00:00 · 2024-03-22 12:19:29 +00:00 · edf05035d0
commit edf05035d0
parent ffc668ad6d 06facabb9d
23 changed files with 57 additions and 18 deletions
--- a/EndlessVendetta/Config/DefaultGame.ini
+++ b/EndlessVendetta/Config/DefaultGame.ini
@ -105,6 +105,8 @@ bSkipMovies=False
 +MapsToCook=(FilePath="/Game/Levels/TempOpenWorld")
 +MapsToCook=(FilePath="/Game/Levels/EnemyAITest")
 +MapsToCook=(FilePath="/Game/Levels/OpenWorldRework")
 +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies")
 +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
 +DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Materials")
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Material.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Material.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Vent.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Vent.uasset
--- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/PachinkoOwner/BP_PachinkoOwner.uasset
+++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/PachinkoOwner/BP_PachinkoOwner.uasset
--- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_GainAccessToTheOffice.uasset
+++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/Checkpoints/OpenWorldCheckpoints/OWCP_GainAccessToTheOffice.uasset
--- a/EndlessVendetta/Content/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies.umap
+++ b/EndlessVendetta/Content/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies.umap
--- a/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset
+++ b/EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset
--- a/EndlessVendetta/Content/BountySystem/WBP_OpenWorldTips.uasset
+++ b/EndlessVendetta/Content/BountySystem/WBP_OpenWorldTips.uasset
--- a/EndlessVendetta/Content/Levels/Apartment_hit.umap
+++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap
--- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
+++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
--- a/EndlessVendetta/Content/Levels/OpenWorldRework.umap
+++ b/EndlessVendetta/Content/Levels/OpenWorldRework.umap
--- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
+++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
--- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
+++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/7S/C7B91LA1JCEE2F9DH3GRNW.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/7S/C7B91LA1JCEE2F9DH3GRNW.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/VE/5UUFSL2KJHX63MMCII5TBD.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/VE/5UUFSL2KJHX63MMCII5TBD.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/2/6R/LMJ1CQ0M42YIAASZ5RC79J.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/2/6R/LMJ1CQ0M42YIAASZ5RC79J.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/4/Z5/YGSCACJJ7CDFIWH5PPG6EZ.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/4/Z5/YGSCACJJ7CDFIWH5PPG6EZ.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/7/HV/7VTDEJZ6EVN0HDMNCLA327.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/7/HV/7VTDEJZ6EVN0HDMNCLA327.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/64/VI2XT2MBUWXXJ16A2JROZP.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/64/VI2XT2MBUWXXJ16A2JROZP.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/T5/V4KL63P4GJZNZ3YW4433PK.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/T5/V4KL63P4GJZNZ3YW4433PK.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/77/4KB686NHOWSVOS11ADBN02.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/77/4KB686NHOWSVOS11ADBN02.uasset
--- a/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/PI/SX1D1XV4LIFTTDZONWUS18.uasset
+++ b/EndlessVendetta/Content/ExternalActors/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/PI/SX1D1XV4LIFTTDZONWUS18.uasset
--- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp
@ -194,6 +194,7 @@ void ABountyHunterCharacter::CreatePauseMenuTabs()
 		BountiesTab->TrackSideBountyDelegate.AddDynamic(this, &ABountyHunterCharacter::TrackSideBounty);
 	}	
 	UpdateBountyTabInfo();
 	EarnFavours(10);
 	FavoursTab = CreateWidget<UTabWidget>(GetWorld(), FavoursTabWidgetClass);
 	NavigationTab = CreateWidget<UTabWidget>(GetWorld(), NavigationTabWidgetClass);
 	SettingsTab = CreateWidget<UTabWidget>(GetWorld(), SettingsTabWidgetClass);