diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index e6bfa0b..d9ff05e 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -14,6 +14,7 @@ EditorStartupMap=/Game/Scenes/CentralLondon.CentralLondon [/Script/Engine.RendererSettings] r.DefaultFeature.AntiAliasing=2 +r.DefaultFeature.AutoExposure=False [/Script/Engine.UserInterfaceSettings] RenderFocusRule=NavigationOnly diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 4e65229..060429b 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -5,7 +5,7 @@ ProjectID=543F4F9E4DE525696C82F5A52303C15C Build=IfProjectHasCode BuildConfiguration=PPBC_Development StagingDirectory=(Path="D:/LifePlay_Build") -FullRebuild=False +FullRebuild=True ForDistribution=True IncludeDebugFiles=False BlueprintNativizationMethod=Disabled @@ -41,4 +41,3 @@ bWaitForMoviesToComplete=False bMoviesAreSkippable=False +StartupMovies=loading - diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 1ceee0c..7bcfd28 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -57,6 +57,8 @@ DefaultViewportMouseLockMode=LockAlways +ActionMappings=(ActionName="ManualAnimating",Key=LeftControl,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="ManualAnimating",Key=RightControl,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="TestScenes",Key=#,bShift=False,bCtrl=False,bAlt=False,bCmd=False) ++ActionMappings=(ActionName="SpeedUp",Key=NumPadSix,bShift=False,bCtrl=False,bAlt=False,bCmd=False) ++ActionMappings=(ActionName="SpeedDown",Key=NumPadFour,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +AxisMappings=(AxisName="LeftRight",Key=Right,Scale=1.000000) +AxisMappings=(AxisName="LeftRight",Key=Left,Scale=-1.000000) +AxisMappings=(AxisName="DownUp",Key=Up,Scale=1.000000) diff --git a/Content/BPs/Birdview.uasset b/Content/BPs/Birdview.uasset index 6f66f9d..d1f17e7 100644 Binary files a/Content/BPs/Birdview.uasset and b/Content/BPs/Birdview.uasset differ diff --git a/Content/BPs/CityExpansion.uasset b/Content/BPs/CityExpansion.uasset new file mode 100644 index 0000000..bfb04aa Binary files /dev/null and b/Content/BPs/CityExpansion.uasset differ diff --git a/Content/BPs/GI.uasset b/Content/BPs/GI.uasset index 5fe358b..7c0606c 100644 Binary files a/Content/BPs/GI.uasset and b/Content/BPs/GI.uasset differ diff --git a/Content/BPs/PC.uasset b/Content/BPs/PC.uasset index d077cfb..7c47c1a 100644 Binary files a/Content/BPs/PC.uasset and b/Content/BPs/PC.uasset differ diff --git a/Content/BPs/Person.uasset b/Content/BPs/Person.uasset index d4a6bbe..03639be 100644 Binary files a/Content/BPs/Person.uasset and b/Content/BPs/Person.uasset differ diff --git a/Content/BPs/Save.uasset b/Content/BPs/Save.uasset index 1fb7b94..6f156c5 100644 Binary files a/Content/BPs/Save.uasset and b/Content/BPs/Save.uasset differ diff --git a/Content/BPs/StreetMap_Static.uasset b/Content/BPs/StreetMap_Static.uasset index 6d449e0..3f31e3e 100644 Binary files a/Content/BPs/StreetMap_Static.uasset and b/Content/BPs/StreetMap_Static.uasset differ diff --git a/Content/Scenes/CentralLondon.umap b/Content/Scenes/CentralLondon.umap index 31ba7a8..1617c2a 100644 Binary files a/Content/Scenes/CentralLondon.umap and b/Content/Scenes/CentralLondon.umap differ diff --git a/Content/Scenes/CentralLondon_BuiltData.uasset b/Content/Scenes/CentralLondon_BuiltData.uasset index ac0aebf..097cf22 100644 Binary files a/Content/Scenes/CentralLondon_BuiltData.uasset and b/Content/Scenes/CentralLondon_BuiltData.uasset differ diff --git a/Content/Structs/DelayedChange.uasset b/Content/Structs/DelayedChange.uasset new file mode 100644 index 0000000..188d822 Binary files /dev/null and b/Content/Structs/DelayedChange.uasset differ diff --git a/Content/UI/Action.uasset b/Content/UI/Action.uasset index dc1dea8..c479101 100644 Binary files a/Content/UI/Action.uasset and b/Content/UI/Action.uasset differ diff --git a/Content/UI/BuildingEdit.uasset b/Content/UI/BuildingEdit.uasset new file mode 100644 index 0000000..e3135ea Binary files /dev/null and b/Content/UI/BuildingEdit.uasset differ diff --git a/Content/UI/ContactMenu.uasset b/Content/UI/ContactMenu.uasset index 7dddb22..aed467d 100644 Binary files a/Content/UI/ContactMenu.uasset and b/Content/UI/ContactMenu.uasset differ diff --git a/Content/UI/Cursor.uasset b/Content/UI/Cursor.uasset index e83312c..c6aebe9 100644 Binary files a/Content/UI/Cursor.uasset and b/Content/UI/Cursor.uasset differ diff --git a/Content/UI/DirtyTalk.uasset b/Content/UI/DirtyTalk.uasset index fd736ea..25ff28f 100644 Binary files a/Content/UI/DirtyTalk.uasset and b/Content/UI/DirtyTalk.uasset differ diff --git a/Content/UI/Favorite.uasset b/Content/UI/Favorite.uasset index bf01950..c74b933 100644 Binary files a/Content/UI/Favorite.uasset and b/Content/UI/Favorite.uasset differ diff --git a/Content/UI/Icons/Amenities/questionmark.uasset b/Content/UI/Icons/Amenities/questionmark.uasset new file mode 100644 index 0000000..3c06621 Binary files /dev/null and b/Content/UI/Icons/Amenities/questionmark.uasset differ diff --git a/Content/UI/Inventory.uasset b/Content/UI/Inventory.uasset index fa0bc3d..fed678d 100644 Binary files a/Content/UI/Inventory.uasset and b/Content/UI/Inventory.uasset differ diff --git a/Content/UI/MainMenu.uasset b/Content/UI/MainMenu.uasset index 7c826b0..f8d20e8 100644 Binary files a/Content/UI/MainMenu.uasset and b/Content/UI/MainMenu.uasset differ diff --git a/Content/UI/ScreenTint.uasset b/Content/UI/ScreenTint.uasset index 8d54965..06c724e 100644 Binary files a/Content/UI/ScreenTint.uasset and b/Content/UI/ScreenTint.uasset differ diff --git a/Content/UI/StatAdjust.uasset b/Content/UI/StatAdjust.uasset index 925ea2e..092fcb0 100644 Binary files a/Content/UI/StatAdjust.uasset and b/Content/UI/StatAdjust.uasset differ diff --git a/Content/UI/StatMenu.uasset b/Content/UI/StatMenu.uasset index 7e312f7..69ef3f3 100644 Binary files a/Content/UI/StatMenu.uasset and b/Content/UI/StatMenu.uasset differ diff --git a/Content/UI/StatNumber.uasset b/Content/UI/StatNumber.uasset index 6c39a50..6330d1e 100644 Binary files a/Content/UI/StatNumber.uasset and b/Content/UI/StatNumber.uasset differ diff --git a/Content/UI/TopRight.uasset b/Content/UI/TopRight.uasset index 2308f6d..4cc2114 100644 Binary files a/Content/UI/TopRight.uasset and b/Content/UI/TopRight.uasset differ diff --git a/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp b/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp index 74aba92..dd01273 100644 --- a/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp +++ b/Plugins/ModdingExtra/Source/ModdingExtra/Private/ModdingExtraBPLibrary.cpp @@ -79,3 +79,23 @@ bool UModdingExtraBPLibrary::SaveTxt(FString SaveTextB, FString FileNameB) return FullPath; } + bool UModdingExtraBPLibrary::IsPointInsidePolygon( const TArray& Polygon, const FVector2D Point ) +{ + const int NumCorners = Polygon.Num(); + int PreviousCornerIndex = NumCorners - 1; + bool bIsInside = false; + + for( int CornerIndex = 0; CornerIndex < NumCorners; CornerIndex++ ) + { + if( ( ( Polygon[ CornerIndex ].Y < Point.Y && Polygon[ PreviousCornerIndex ].Y >= Point.Y ) || ( Polygon[ PreviousCornerIndex ].Y < Point.Y && Polygon[ CornerIndex ].Y >= Point.Y ) ) && + ( Polygon[ CornerIndex ].X <= Point.X || Polygon[ PreviousCornerIndex ].X <= Point.X ) ) + { + bIsInside ^= ( Polygon[ CornerIndex ].X + ( Point.Y - Polygon[ CornerIndex ].Y ) / ( Polygon[ PreviousCornerIndex ].Y - Polygon[ CornerIndex ].Y )*( Polygon[ PreviousCornerIndex ].X - Polygon[ CornerIndex ].X ) < Point.X ); + } + + PreviousCornerIndex = CornerIndex; + } + + return bIsInside; +} + diff --git a/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h b/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h index 54b896e..d92c985 100644 --- a/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h +++ b/Plugins/ModdingExtra/Source/ModdingExtra/Public/ModdingExtraBPLibrary.h @@ -44,4 +44,7 @@ class UModdingExtraBPLibrary : public UBlueprintFunctionLibrary UFUNCTION(BlueprintPure, Category = "ModdingExtra") static bool GetAllSubfolders(TArray& Folders, FString RootFolderFullPath); + + UFUNCTION(BlueprintPure, Category = "ModdingExtra", meta = (Keywords = "IsPointInsidePolygon")) + static bool IsPointInsidePolygon(const TArray& Polygon, const FVector2D Point); };