diff --git a/.gitignore b/.gitignore index 2b40c31..9de2d73 100644 --- a/.gitignore +++ b/.gitignore @@ -13,11 +13,9 @@ Saved *.xcodeproj *.xcworkspace -Content/StreetMap/* -Content/Characters/* -Content/Backgrounds/* +Content/Heavy/* Plugins/StreetMap/Binaries/* Plugins/StreetMap/Intermediate/* -Content/StreetMap/CentralLondon.uasset -Content/StreetMap/Static/CentralLondon0.uasset +Plugins/ModdingExtra/Binaries/* +Plugins/ModdingExtra/Intermediate/* *.png diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index dce2586..9acaa13 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -32,7 +32,7 @@ bCompressed=False bEncryptIniFiles=False bEncryptPakIndex=False bSkipEditorContent=False -+DirectoriesToAlwaysStageAsNonUFS=(Path="Events") ++DirectoriesToAlwaysStageAsNonUFS=(Path="Modules") bNativizeBlueprintAssets=False bNativizeOnlySelectedBlueprints=False diff --git a/Content/BPs/GI.uasset b/Content/BPs/GI.uasset index 6a09273..0cc314d 100644 Binary files a/Content/BPs/GI.uasset and b/Content/BPs/GI.uasset differ diff --git a/Content/BPs/Person.uasset b/Content/BPs/Person.uasset index b828336..aa7194a 100644 Binary files a/Content/BPs/Person.uasset and b/Content/BPs/Person.uasset differ diff --git a/Content/BPs/StreetMap_Static.uasset b/Content/BPs/StreetMap_Static.uasset index ef4519d..4eab5b8 100644 Binary files a/Content/BPs/StreetMap_Static.uasset and b/Content/BPs/StreetMap_Static.uasset differ diff --git a/Content/Characters/Anims/idle.uasset b/Content/Characters/Anims/idle.uasset new file mode 100644 index 0000000..93dd971 Binary files /dev/null and b/Content/Characters/Anims/idle.uasset differ diff --git a/Content/Characters/CauM/M_Cau.uasset b/Content/Characters/CauM/M_Cau.uasset new file mode 100644 index 0000000..9cdec97 Binary files /dev/null and b/Content/Characters/CauM/M_Cau.uasset differ diff --git a/Content/Clothes/ClothMaterials/Wool.uasset b/Content/Clothes/ClothMaterials/Wool.uasset deleted file mode 100644 index d83052b..0000000 Binary files a/Content/Clothes/ClothMaterials/Wool.uasset and /dev/null differ diff --git a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater.uasset b/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater.uasset deleted file mode 100644 index 291018f..0000000 Binary files a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater.uasset and /dev/null differ diff --git a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Rigged.uasset b/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Rigged.uasset index 3adf17c..b6deeb8 100644 Binary files a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Rigged.uasset and b/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Rigged.uasset differ diff --git a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Rigged_PhysicsAsset.uasset b/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Rigged_PhysicsAsset.uasset deleted file mode 100644 index 766320e..0000000 Binary files a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Rigged_PhysicsAsset.uasset and /dev/null differ diff --git a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Skeleton.uasset b/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Skeleton.uasset deleted file mode 100644 index a6459bc..0000000 Binary files a/Content/Clothes/Fisherman_Sweater/Fisherman_Sweater_Skeleton.uasset and /dev/null differ diff --git a/Content/Events/vin_TestEvent.lifeplay b/Content/Events/vin_TestEvent.lifeplay deleted file mode 100644 index 5ab2f8a..0000000 --- a/Content/Events/vin_TestEvent.lifeplay +++ /dev/null @@ -1 +0,0 @@ -Hello \ No newline at end of file diff --git a/Content/Render/BackgroundMaterial.uasset b/Content/Render/BackgroundMaterial.uasset index da777ce..2c58260 100644 Binary files a/Content/Render/BackgroundMaterial.uasset and b/Content/Render/BackgroundMaterial.uasset differ diff --git a/Content/Render/FaceRT.uasset b/Content/Render/FaceRT.uasset index 96b0b6e..b484c4e 100644 Binary files a/Content/Render/FaceRT.uasset and b/Content/Render/FaceRT.uasset differ diff --git a/Content/Scenes/CentralLondon.umap b/Content/Scenes/CentralLondon.umap index a13e452..3e15695 100644 Binary files a/Content/Scenes/CentralLondon.umap and b/Content/Scenes/CentralLondon.umap differ diff --git a/Content/StreetMap/CentralLondon.uasset b/Content/StreetMap/CentralLondon.uasset new file mode 100644 index 0000000..39defd3 Binary files /dev/null and b/Content/StreetMap/CentralLondon.uasset differ diff --git a/Content/StreetMap/Static/CentralLondon.uasset b/Content/StreetMap/Static/CentralLondon.uasset new file mode 100644 index 0000000..bf8f11b Binary files /dev/null and b/Content/StreetMap/Static/CentralLondon.uasset differ diff --git a/DesignIdeas.txt b/DesignIdeas.txt index 29575b5..eb7b9ca 100644 --- a/DesignIdeas.txt +++ b/DesignIdeas.txt @@ -13,6 +13,11 @@ Long-term (regular activity increases, if not, deteriorate) 4. Interpersonal Skills 5. Perversion +Relationship +1. OpinionOfPlayer +2. PlayerOpinion +4. + Inventory 1. Money (in local currency) 2. Apparel (buff to attractiveness, with tags for work, formal, casual, sports etc) @@ -23,3 +28,27 @@ Effect: 2. Ill 3. Injured + + +Array of Structs as default variable in Person class: +Stat (String) - Value (Float) + +BuildingVisited struct +UID (int) - Building (StreetMapBuilding) - Persons (Person[]) + +PlaceBuilding struct +Place (String) - BuildingID (int) + +RelationshipPersons struct +Relationship (String) - Persons (Person ObjectReference[]) + +Start game with a base person with invisible render +Read data and populate this array in base person +Dupicate base person - first dup is player - set him visible +Add player only stats +Duplicate base person again whenever there's a need to create a new NPC. Clear if not touched for a while. + +Base Person +- StatValue array of structs (Mood: 69, Energy: 88, PlayerOpinion: 59, etc) +- PlaceBuilding array of structs (Home: 7999, Office: 6899, etc) +- RelationshipPersons array of structs ("Friends": Jack, John, Maria references) diff --git a/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp b/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp index 6c52a19..de7ec11 100644 --- a/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp +++ b/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp @@ -38,10 +38,30 @@ float UModdingExtraBPLibrary::ModdingExtraSampleFunction(float Param) } FString FinalPath = FullPath + "/" + RootFolderFullPath + "/" + Ext; - FileManager.FindFiles(Files, *FinalPath, true, false); + FString FinalPathWithoutExt = FullPath + "/" + RootFolderFullPath + "/"; + + //FileManager.FindFiles(Files, *FinalPath, true, false); + FileManager.FindFilesRecursive(Files, *FinalPathWithoutExt, *Ext, true, false, false); return true; } + + bool UModdingExtraBPLibrary::GetAllSubfolders(TArray& Folders, FString RootFolderFullPath) + { + if(RootFolderFullPath.Len() < 1) return false; + + IFileManager& FileManager = IFileManager::Get(); + + FString RelativePath = FPaths::ProjectContentDir(); + FString FullPath = FileManager.ConvertToAbsolutePathForExternalAppForRead(*RelativePath); + + FString FinalPath = FullPath + "/" + RootFolderFullPath + "/"; + + FileManager.FindFiles(Folders, *FinalPath, false, true); + return true; + } + + bool UModdingExtraBPLibrary::LoadTxt(FString FileNameA, FString& SaveTextA) { return FFileHelper::LoadFileToString(SaveTextA, *(FPaths::ProjectContentDir() + FileNameA)); diff --git a/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h b/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h index e7c2ed7..4619a53 100644 --- a/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h +++ b/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h @@ -38,4 +38,7 @@ class UModdingExtraBPLibrary : public UBlueprintFunctionLibrary UFUNCTION(BlueprintPure, Category = "ModdingExtra") static FString ContentDirectory(); + + UFUNCTION(BlueprintPure, Category = "ModdingExtra") + static bool GetAllSubfolders(TArray& Folders, FString RootFolderFullPath); };