BugFix Merge Errors With Apartment Level

EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml

@@ -3,17 +3,44 @@
   <component name="AutoGeneratedRunConfigurationManager">
     <projectFile>Intermediate/ProjectFiles/EndlessVendetta.vcxproj</projectFile>
   </component>
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
   <component name="ChangeListManager">
-    <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
+    <list default="true" id="6b877713-7611-482b-88e8-6a3c0d51c7b4" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/SM_HandGun_Skeleton.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Config/DefaultGame.ini" beforeDir="false" afterPath="$PROJECT_DIR$/Config/DefaultGame.ini" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror_Texture/Bathroom_Mirror.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Mirror_Texture/Bathroom_Mirror.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Texture/Shower_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Shower_Texture/Shower_Texture.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/D/HT/HCK94DMZ442FV8M21GRO0Q.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Texture/Sink_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Sink_Texture/Sink_Texture.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Texture/Tap_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Tap_Texture/Tap_Texture.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Seat_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Seat_Texture.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Toilet/Toilet_Texture.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Toilet/Toilet_Texture.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Counter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Counter.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Cupboard44.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Cupboard44.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Draws.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Draws.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/lamp_01/lamp_01_blue.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/lamp_01/lamp_01_blue.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_01/wall_light_01_orange.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_01/wall_light_01_orange.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_02/wall_light_02_orange.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Lights/lights_textures/wall_light_02/wall_light_02_orange.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/B_BookShelf.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/B_BookShelf.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/M_Books.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf/M_Books.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf_Edge/M_BooksShelfEdge.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/BookShelf_Edge/M_BooksShelfEdge.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/CLOCK01/m_clock01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/CLOCK01/m_clock01.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Chamber.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Chamber.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Gameboy_MugCup01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Gameboy_MugCup01.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Table02.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_Table02.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_WallPiece.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/M_WallPiece.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/TRadio/M_Radio.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/TRadio/M_Radio.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cabinets/cabinet_01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cabinets/cabinet_01.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/chair_01/chair.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/chair_01/chair.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_bl.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_bl.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/fireplace/fireplace.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/fireplace/fireplace.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/sofa_02/sofa_02.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Assets/Objects/Tutorial-Level/Textures/sofa_02/sofa_02.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/MainMenuLevel.umap" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EVGameInstance.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendetta.Build.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/EndlessVendetta.Build.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,37 +53,35 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectColorInfo">{
+  <component name="ProjectColorInfo"><![CDATA[{
-  &quot;customColor&quot;: &quot;&quot;,
+  "customColor": "",
-  &quot;associatedIndex&quot;: 5
+  "associatedIndex": 5
-}</component>
+}]]></component>
-  <component name="ProjectId" id="2bBQ5ZFjKADdlvCf2VePqJdIy1m" />
+  <component name="ProjectId" id="2bp4f0aLGz4XHjaYb9EKOrNfYuz" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;C++ Project.EndlessVendetta.executor&quot;: &quot;Run&quot;,
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "git-widget-placeholder": "TempBuildSetup",
-    &quot;git-widget-placeholder&quot;: &quot;attachment-bug-fix&quot;,
+    "node.js.detected.package.eslint": "true",
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    "node.js.detected.package.tslint": "true",
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    "node.js.selected.package.eslint": "(autodetect)",
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    "node.js.selected.package.tslint": "(autodetect)",
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    "nodejs_package_manager_path": "npm",
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    "vue.rearranger.settings.migration": "true"
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  &quot;keyToStringList&quot;: {
+  "keyToStringList": {
-    &quot;rider.external.source.directories&quot;: [
+    "rider.external.source.directories": [
-      &quot;C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache&quot;,
+      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
-      &quot;C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache&quot;,
+      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
-      &quot;C:\\Users\\mhara\\AppData\\Local\\Symbols\\src&quot;
+      "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src"
     ]
   }
-}</component>
+}]]></component>
   <component name="RunManager">
     <configuration name="EndlessVendetta" type="CppProject" factoryName="C++ Project">
       <configuration_1>
@@ -123,20 +148,12 @@
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="" />
+      <changelist id="6b877713-7611-482b-88e8-6a3c0d51c7b4" name="Changes" comment="" />
-      <created>1705685810960</created>
+      <created>1706898787115</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1705685810960</updated>
+      <updated>1706898787115</updated>
-      <workItem from="1705685813496" duration="6457000" />
+      <workItem from="1706898789667" duration="426000" />
-      <workItem from="1705756768038" duration="3821000" />
-      <workItem from="1705856571902" duration="3954000" />
-      <workItem from="1706110241756" duration="1092000" />
-      <workItem from="1706705451486" duration="5218000" />
-      <workItem from="1706727398145" duration="597000" />
-      <workItem from="1706790490396" duration="10304000" />
-      <workItem from="1706802528693" duration="3999000" />
-      <workItem from="1706807322577" duration="2357000" />
     </task>
     <servers />
   </component>

EndlessVendetta/Config/DefaultGame.ini

@@ -102,6 +102,8 @@ bSkipMovies=False
 +MapsToCook=(FilePath="/Game/Levels/ControlTutorialLevel")
 +MapsToCook=(FilePath="/Game/Levels/Apartment_hit")
 +MapsToCook=(FilePath="/Game/Levels/MainMenuLevel")
++MapsToCook=(FilePath="/Game/Levels/TempOpenWorld")
++MapsToCook=(FilePath="/Game/Levels/EnemyAITest")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
 +DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Materials")

EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e024c0ced7b91dd05018d6261141732c5a20c0ad836a2037599848f770a3dfa
+oid sha256:aebdbf8cc9c9e7a79e8c3aa030177ebbc24a049b2bd22748408da5ce58519413
-size 261
+size 66790690

EndlessVendetta/Source/EndlessVendetta/EVGameInstance.cpp

@@ -22,6 +22,11 @@ int UEVGameInstance::LoadSaveGameInstance()
 	return MainSaveGameInstanceRef->CurrentMainBountyIndexSave;
 }
 
+void UEVGameInstance::DeleteSaveGameFiles()
+{
+	if (UGameplayStatics::DoesSaveGameExist("MainSave", 0)) UGameplayStatics::DeleteGameInSlot("MainSave", 0);
+}
+
 void UEVGameInstance::OnStart()
 {
 	Super::OnStart();

EndlessVendetta/Source/EndlessVendetta/EVGameInstance.h

@@ -28,6 +28,9 @@ public:
 
 	UFUNCTION(BlueprintCallable)
 	int LoadSaveGameInstance();
+
+	UFUNCTION(BlueprintCallable)
+	void DeleteSaveGameFiles();
 		
 protected:
 	virtual void OnStart() override;

EndlessVendetta/Source/EndlessVendetta/EndlessVendetta.Build.cs

@@ -15,6 +15,6 @@ public class EndlessVendetta : ModuleRules
 			"HTTP", "Json", "JsonUtilities", "VaultIt", "MotionWarping", "GameplayAbilities"
 		});
 
-		PrivateDependencyModuleNames.AddRange(new string[] { "GenericGraphRuntime" });
+		PrivateDependencyModuleNames.AddRange(new string[] { "GenericGraphRuntime"});
 	}
 }