Compare commits
3 Commits
74badcca9b
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d8d80e6a9 | |||
| 33a1201424 | |||
| dbcd107343 |
@@ -26,8 +26,8 @@
|
||||
{
|
||||
"Name": "SML",
|
||||
"Enabled": true,
|
||||
"SemVersion": "^3.11.1"
|
||||
"SemVersion": "^3.12.0"
|
||||
}
|
||||
],
|
||||
"GameVersion": ">=416835"
|
||||
"GameVersion": ">=491125"
|
||||
}
|
||||
@@ -265,13 +265,13 @@ int32 URRDADataAssetSubsystem::GetAllDirtItems(TArray<TSubclassOf<UFGItemDescrip
|
||||
|
||||
URRDADirtDataAsset* URRDADataAssetSubsystem::GetDataForDirtItem(TSubclassOf<UFGItemDescriptor> Item) const {
|
||||
if (!Item) return nullptr;
|
||||
URRDADirtDataAsset* const* Desc = mDirtAssets.Find(Item);
|
||||
TObjectPtr<URRDADirtDataAsset> const* Desc = mDirtAssets.Find(Item);
|
||||
if (!Desc) return nullptr;
|
||||
return *Desc;
|
||||
}
|
||||
|
||||
TArray<URRDADirtDataAsset*> URRDADataAssetSubsystem::GetAllDirtAssets() const {
|
||||
TArray<URRDADirtDataAsset*> Assets;
|
||||
TArray<TObjectPtr<URRDADirtDataAsset>> Assets;
|
||||
mDirtAssets.GenerateValueArray(Assets);
|
||||
return Assets;
|
||||
}
|
||||
@@ -402,7 +402,7 @@ TArray<URRDATurbineDataAsset*> URRDADataAssetSubsystem::GetAllTurbineAssets(int3
|
||||
return TArray<URRDATurbineDataAsset*>();
|
||||
}
|
||||
|
||||
TArray<URRDATurbineDataAsset*> Assets;
|
||||
TArray<TObjectPtr<URRDATurbineDataAsset>> Assets;
|
||||
mTurbineAssets[Tier].Data.GenerateValueArray(Assets);
|
||||
return Assets;
|
||||
}
|
||||
@@ -444,7 +444,7 @@ TArray<URRDACoolerDataAsset*> URRDADataAssetSubsystem::GetAllCoolerAssets(ERRDAC
|
||||
return TArray<URRDACoolerDataAsset*>();
|
||||
}
|
||||
|
||||
TArray<URRDACoolerDataAsset*> Assets;
|
||||
TArray<TObjectPtr<URRDACoolerDataAsset>> Assets;
|
||||
mCoolerAssets[Type].Data.GenerateValueArray(Assets);
|
||||
|
||||
return Assets;
|
||||
@@ -490,7 +490,7 @@ TArray<URRDABoilerDataAsset*> URRDADataAssetSubsystem::GetAllBoilerAssets(int32
|
||||
return TArray<URRDABoilerDataAsset*>();
|
||||
}
|
||||
|
||||
TArray<URRDABoilerDataAsset*> Assets;
|
||||
TArray<TObjectPtr<URRDABoilerDataAsset>> Assets;
|
||||
mBoilerAssets[Tier].Data.GenerateValueArray(Assets);
|
||||
|
||||
return Assets;
|
||||
@@ -531,7 +531,7 @@ TArray<URRDAHeaterDataAsset*> URRDADataAssetSubsystem::GetAllHeaterAssets(ERRDAH
|
||||
return TArray<URRDAHeaterDataAsset*>();
|
||||
}
|
||||
|
||||
TArray<URRDAHeaterDataAsset*> Assets;
|
||||
TArray<TObjectPtr<URRDAHeaterDataAsset>> Assets;
|
||||
mHeaterAssets[Type].Data.GenerateValueArray(Assets);
|
||||
|
||||
return Assets;
|
||||
|
||||
@@ -42,5 +42,5 @@ public:
|
||||
* Curve for the production to Heat
|
||||
*/
|
||||
UPROPERTY( EditDefaultsOnly, BlueprintReadOnly, Category = "Boiler" )
|
||||
UCurveFloat* mBoilerCurve;
|
||||
TObjectPtr<UCurveFloat> mBoilerCurve;
|
||||
};
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
|
||||
/* The Adapter Cover Asset */
|
||||
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ModAdapter")
|
||||
URRDADataAssetDSAdapterCovers* mAdapterCoversAsset;
|
||||
TObjectPtr<URRDADataAssetDSAdapterCovers> mAdapterCoversAsset;
|
||||
|
||||
/* Select which inventories can be accessed by Digital Storage */
|
||||
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="ModAdapter")
|
||||
|
||||
@@ -36,5 +36,5 @@ public:
|
||||
* Curve that defines the power output of the generator
|
||||
*/
|
||||
UPROPERTY( EditAnywhere, BlueprintReadWrite, Category = "Generator" )
|
||||
UCurveFloat* mGeneratorCurve;
|
||||
TObjectPtr<UCurveFloat> mGeneratorCurve;
|
||||
};
|
||||
@@ -28,7 +28,7 @@ struct FRRDADataHolderTurbineData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDATurbineDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDATurbineDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -37,7 +37,7 @@ struct FRRDADataHolderBoilerData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDABoilerDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDABoilerDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -46,7 +46,7 @@ struct FRRDADataHolderCoolerData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDACoolerDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDACoolerDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -55,7 +55,7 @@ struct FRRDADataHolderHeaterData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY(BlueprintReadOnly)
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDAHeaterDataAsset*> Data;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDAHeaterDataAsset>> Data;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
@@ -64,13 +64,13 @@ struct FRRDADataHolderDSBuildingData
|
||||
GENERATED_BODY()
|
||||
|
||||
UPROPERTY()
|
||||
URRDADataAssetDSAdapterCovers* AdapterCovers;
|
||||
TObjectPtr<URRDADataAssetDSAdapterCovers> AdapterCovers;
|
||||
|
||||
UPROPERTY()
|
||||
URRDADataAssetDSModAdapter* ModAdapter;
|
||||
TObjectPtr<URRDADataAssetDSModAdapter> ModAdapter;
|
||||
|
||||
UPROPERTY()
|
||||
TArray<URRDADataAssetDSItemFilter*> ItemFilters;
|
||||
TArray<TObjectPtr<URRDADataAssetDSItemFilter>> ItemFilters;
|
||||
};
|
||||
|
||||
UCLASS()
|
||||
@@ -227,13 +227,13 @@ public:
|
||||
|
||||
public:
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, URRDADirtDataAsset*> mDirtAssets;
|
||||
TMap<TSubclassOf<UFGItemDescriptor>, TObjectPtr<URRDADirtDataAsset>> mDirtAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<TSubclassOf<AFGBuildableFactory>, FRRDADataHolderDSBuildingData> mDSBuildingData;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<int32, URRDAGeneratorDataAsset*> mGeneratorAssets;
|
||||
TMap<int32, TObjectPtr<URRDAGeneratorDataAsset>> mGeneratorAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TMap<int32, FRRDADataHolderTurbineData> mTurbineAssets;
|
||||
@@ -248,13 +248,13 @@ public:
|
||||
TMap<ERRDAHeaterType, FRRDADataHolderHeaterData> mHeaterAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TArray<URRDADataAssetSolarPower*> mSolarPowerAssets;
|
||||
TArray<TObjectPtr<URRDADataAssetSolarPower>> mSolarPowerAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TSet<URRDADataAssetBase*> mDisabledDataAssets;
|
||||
TSet<TObjectPtr<URRDADataAssetBase>> mDisabledDataAssets;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Category = "RRDA|DataAsset")
|
||||
TSet<URRDADataAssetBase*> mEnabledDataAssets;
|
||||
TSet<TObjectPtr<URRDADataAssetBase>> mEnabledDataAssets;
|
||||
};
|
||||
|
||||
template <class T>
|
||||
|
||||
@@ -47,7 +47,7 @@ public class RefinedRDApi : ModuleRules
|
||||
PublicDependencyModuleNames.AddRange(new[]
|
||||
{
|
||||
"AbstractInstance",
|
||||
"InstancedSplinesComponent",
|
||||
//"InstancedSplinesComponent",
|
||||
"SignificanceISPC"
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user