adding chainsaw to common types

- re: #5
satisfactory-dev · Nov 10, 2024 · 5dbb788 · 5dbb788
1 parent eae6d97
commit 5dbb788
Show file tree

Hide file tree

Showing 13 changed files with 135 additions and 131 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -10,6 +10,7 @@
 	"common_type__class__no_description_or_display_name__type": "common/unassigned",
 	"common_type__color__type": "common/unassigned",
 	"common_type__color_decimal__type": "common/unassigned",
+	"common_type__common_base__mChainsawState__type": "common/unassigned",
 	"common_type__common_base__mSnappedPassthroughs__type": "common/unassigned",
 	"common_type__empty_object__type": "common/unassigned",
 	"common_type__InfinityExtrap__type": "common/unassigned",
@@ -73,6 +74,7 @@
 	"common_type__common_base__FGBuildingDescriptor__ClassName__type": "classes/CoreUObject/FGBuildingDescriptor",
 	"common_type__common_base__FGBuildingDescriptor__mForm__type": "classes/CoreUObject/FGBuildingDescriptor",
 	"common_type__common_base__FGBuildingDescriptor__mSubCategories__type": "classes/CoreUObject/FGBuildingDescriptor",
+	"common_type__common_base__FGChainsaw__type": "classes/CoreUObject/FGChainsaw",
 	"common_type__common_base__FGCustomizationRecipe__FGRecipe__type": "classes/CoreUObject/FGCustomizationRecipe",
 	"common_type__common_base__FGEquipment__base__type": "classes/CoreUObject/FGEquipment",
 	"common_type__common_base__FGEquipmentStunSpear__type": "classes/CoreUObject/FGEquipmentStunSpear",

diff --git a/generated-types/1.0/classes/CoreUObject/FGChainsaw.ts b/generated-types/1.0/classes/CoreUObject/FGChainsaw.ts
@@ -1,15 +1,10 @@
 import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
 
-import {
-	Montage_1P__type,
-	Montage_3P__type,
-	mChainsawState__type,
-} from '../../common/unassigned';
+import {Montage_1P__type, Montage_3P__type} from '../../common/unassigned';
 
 import {FGEquipment__base__type} from './FGEquipment';
 
 import {
-	decimal_string__type,
 	integer_string__type,
 	boolean__type,
 } from '../../../common/common/scalar';
@@ -19,12 +14,10 @@ import {
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 
-export type FGChainsaw__type = FGEquipment__base__type & {
-	mInterpSawProgress: decimal_string__type;
-	mCurrentOutputDataSFX: decimal_string__type;
+import {common_base__FGChainsaw__type} from '../../../common/classes/CoreUObject/FGChainsaw';
+
+export type FGChainsaw__type = FGChainsaw__merged__type & {
 	StartUpToIdleID: integer_string__type;
-	mCurrentHasFuel: boolean__type;
-	mPreviousState: mChainsawState__type;
 	mChainsawEngageMontage: {
 		Montage_1P: Montage_1P__type;
 		Montage_Equipment: FGChainsaw__Montage_Equipment__type;
@@ -53,18 +46,15 @@ export type FGChainsaw__type = FGEquipment__base__type & {
 	['IdlePlaying ID']: integer_string__type;
 	['Playing ID']: integer_string__type;
 	SawingPlayingID: integer_string__type;
-	mEnergyConsumption: decimal_string__type;
-	mSawDownTreeTime: decimal_string__type;
-	mCollateralPickupRadius: decimal_string__type;
 	mIsAOEOn: boolean__type;
-	mEnergyStored: decimal_string__type;
-	mSawingProgress: decimal_string__type;
-	mChainsawState: mChainsawState__type;
 	mEquipMontage?: empty_object__type;
 	mStingerMontage?: empty_object__type;
 	mUnEquipMontage?: empty_object__type;
 };
 
+export type FGChainsaw__merged__type =
+	common_base__FGChainsaw__type & FGEquipment__base__type;
+
 export type FGChainsaw__Montage_Equipment__type = UnrealEngineString<
 	'/Script/Engine.AnimMontage',
 	StringStartsWith<'/Game/FactoryGame/Equipment/Chainsaw/Animation/'>

diff --git a/generated-types/1.0/common/unassigned.ts b/generated-types/1.0/common/unassigned.ts
@@ -12,7 +12,6 @@ import {
 
 import {
 	InfinityExtrap__type,
-	None__type,
 	xyz__type,
 	quaternion__type,
 	empty_object__type,
@@ -222,8 +221,6 @@ export type MaterialSlotName__type =
 	| 'Rifle'
 	| '01 - Default';
 
-export type mChainsawState__type = None__type;
-
 export type mClearanceData__type =
 	| ''
 	| [

diff --git a/generated-types/common/classes/CoreUObject/FGChainsaw.ts b/generated-types/common/classes/CoreUObject/FGChainsaw.ts
@@ -0,0 +1,19 @@
+import {decimal_string__type, boolean__type} from '../../common/scalar';
+
+import {common_base__mChainsawState__type} from '../../common/unassigned';
+
+import {common_base__FGEquipment__base__type} from './FGEquipment';
+
+export type common_base__FGChainsaw__type =
+	common_base__FGEquipment__base__type & {
+		mInterpSawProgress: decimal_string__type;
+		mCurrentOutputDataSFX: decimal_string__type;
+		mCurrentHasFuel: boolean__type;
+		mPreviousState: common_base__mChainsawState__type;
+		mEnergyConsumption: decimal_string__type;
+		mSawDownTreeTime: decimal_string__type;
+		mCollateralPickupRadius: decimal_string__type;
+		mEnergyStored: decimal_string__type;
+		mSawingProgress: decimal_string__type;
+		mChainsawState: common_base__mChainsawState__type;
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -55,6 +55,8 @@ import {common_base__FGSuitBase__type} from '../classes/CoreUObject/FGSuitBase';
 
 import {common_base__FGGasMask__type} from '../classes/CoreUObject/FGGasMask';
 
+import {common_base__FGChainsaw__type} from '../classes/CoreUObject/FGChainsaw';
+
 import {common_base__FGBuildableDroneStation__type} from '../classes/CoreUObject/FGBuildableDroneStation';
 
 import {
@@ -153,6 +155,8 @@ export type color_decimal__type = {
 	A: decimal_string__type;
 };
 
+export type common_base__mChainsawState__type = None__type;
+
 export type common_base__mSnappedPassthroughs__type = '';
 
 export type empty_object__type = '()';
@@ -233,6 +237,8 @@ export type faux_15__type = class__type & {
 	jetpack?: common_base__FGJetPack__type;
 	suit?: common_base__FGSuitBase__type;
 	mask?: common_base__FGGasMask__type;
+	chainsaw?: common_base__FGChainsaw__type;
+	chainsaw_state?: common_base__mChainsawState__type;
 };
 
 export type faux_16__type = class__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGChainsaw.ts b/generated-types/update8/classes/CoreUObject/FGChainsaw.ts
@@ -1,5 +1,3 @@
-import {mChainsawState__type} from '../../common/unassigned';
-
 import {FGEquipment__base__type} from './FGEquipment';
 
 import {
@@ -8,24 +6,19 @@ import {
 	boolean__type,
 } from '../../../common/common/scalar';
 
+import {common_base__FGChainsaw__type} from '../../../common/classes/CoreUObject/FGChainsaw';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGChainsaw__type = FGEquipment__base__type & {
+export type FGChainsaw__type = FGChainsaw__merged__type & {
 	mSawingMontageLength: decimal_string__type;
-	mInterpSawProgress: decimal_string__type;
-	mCurrentOutputDataSFX: decimal_string__type;
 	mCurrentAkID: integer_string__type;
-	mCurrentHasFuel: boolean__type;
-	mPreviousState: mChainsawState__type;
-	mEnergyConsumption: decimal_string__type;
-	mSawDownTreeTime: decimal_string__type;
-	mCollateralPickupRadius: decimal_string__type;
 	mExcludeChainsawableFoliage: boolean__type;
-	mEnergyStored: decimal_string__type;
-	mSawingProgress: decimal_string__type;
-	mChainsawState: mChainsawState__type;
 };
 
+export type FGChainsaw__merged__type =
+	common_base__FGChainsaw__type & FGEquipment__base__type;
+
 export type FGChainsaw__NativeClass = NativeClass__type & {
 	Classes: [FGChainsaw__type];
 };
diff --git a/generated-types/update8/common/unassigned.ts b/generated-types/update8/common/unassigned.ts
@@ -10,7 +10,6 @@ import {
 
 import {
 	InfinityExtrap__type,
-	None__type,
 	empty_object__type,
 } from '../../common/common/unassigned';
 
@@ -156,8 +155,6 @@ export type MaterialSlotName__type =
 	| 'Rifle'
 	| '01 - Default';
 
-export type mChainsawState__type = None__type;
-
 export type mDisableSnapOn__type =
 	| {
 			Front: boolean__type;

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -2449,9 +2449,6 @@
 				}
 			}
 		},
-		"mChainsawState": {
-			"$ref": "common.schema.json#/$defs/None"
-		},
 		"FGChainsaw--Montage_Equipment": {
 			"type": "string",
 			"minLength": 1,
@@ -2462,16 +2459,22 @@
 				}
 			}
 		},
+		"FGChainsaw--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGChainsaw"
+				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				}
+			]
+		},
 		"FGChainsaw": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipment--base",
+			"$ref": "#/$defs/FGChainsaw--merged",
 			"unevaluatedProperties": false,
 			"required": [
-				"mInterpSawProgress",
-				"mCurrentOutputDataSFX",
 				"StartUpToIdleID",
-				"mCurrentHasFuel",
-				"mPreviousState",
 				"mChainsawEngageMontage",
 				"mChainsawSawingMontage",
 				"mChainsawEquipFuelMontage",
@@ -2482,30 +2485,12 @@
 				"IdlePlaying ID",
 				"Playing ID",
 				"SawingPlayingID",
-				"mEnergyConsumption",
-				"mSawDownTreeTime",
-				"mCollateralPickupRadius",
-				"mIsAOEOn",
-				"mEnergyStored",
-				"mSawingProgress",
-				"mChainsawState"
+				"mIsAOEOn"
 			],
 			"properties": {
-				"mInterpSawProgress": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mCurrentOutputDataSFX": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
 				"StartUpToIdleID": {
 					"$ref": "common.schema.json#/$defs/integer-string"
 				},
-				"mCurrentHasFuel": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
-				"mPreviousState": {
-					"$ref": "#/$defs/mChainsawState"
-				},
 				"mChainsawEngageMontage": {
 					"type": "string",
 					"minLength": 1,
@@ -2617,27 +2602,9 @@
 				"SawingPlayingID": {
 					"$ref": "common.schema.json#/$defs/integer-string"
 				},
-				"mEnergyConsumption": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mSawDownTreeTime": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mCollateralPickupRadius": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
 				"mIsAOEOn": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
-				"mEnergyStored": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mSawingProgress": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mChainsawState": {
-					"$ref": "#/$defs/mChainsawState"
-				},
 				"mEquipMontage": {
 					"$ref": "common.schema.json#/$defs/empty-object"
 				},

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -2890,6 +2890,57 @@
 				}
 			}
 		},
+		"common-base--mChainsawState": {
+			"$ref": "common.schema.json#/$defs/None"
+		},
+		"common-base--FGChainsaw": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGEquipment--base",
+			"required": [
+				"mInterpSawProgress",
+				"mCurrentOutputDataSFX",
+				"mCurrentHasFuel",
+				"mPreviousState",
+				"mEnergyConsumption",
+				"mSawDownTreeTime",
+				"mCollateralPickupRadius",
+				"mEnergyStored",
+				"mSawingProgress",
+				"mChainsawState"
+			],
+			"properties": {
+				"mInterpSawProgress": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mCurrentOutputDataSFX": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mCurrentHasFuel": {
+					"$ref": "common.schema.json#/$defs/boolean"
+				},
+				"mPreviousState": {
+					"$ref": "common.schema.json#/$defs/common-base--mChainsawState"
+				},
+				"mEnergyConsumption": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mSawDownTreeTime": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mCollateralPickupRadius": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mEnergyStored": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mSawingProgress": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mChainsawState": {
+					"$ref": "common.schema.json#/$defs/common-base--mChainsawState"
+				}
+			}
+		},
 		"faux-1": {
 			"type": "object",
 			"$ref": "#/$defs/class",
@@ -3232,6 +3283,12 @@
 				},
 				"mask": {
 					"$ref": "#/$defs/common-base--FGGasMask"
+				},
+				"chainsaw": {
+					"$ref": "#/$defs/common-base--FGChainsaw"
+				},
+				"chainsaw_state": {
+					"$ref": "#/$defs/common-base--mChainsawState"
 				}
 			}
 		},