pulling melee weaponry into common types

- re: #5
satisfactory-dev · Nov 9, 2024 · d057213 · d057213
1 parent ec288a1
commit d057213
Show file tree

Hide file tree

Showing 11 changed files with 225 additions and 100 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -75,6 +75,9 @@
 	"common_type__common_base__FGBuildingDescriptor__mSubCategories__type": "classes/CoreUObject/FGBuildingDescriptor",
 	"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",
+	"common_type__common_base__FGEquipmentStunSpear__base__type": "classes/CoreUObject/FGEquipmentStunSpear",
+	"common_type__common_base__FGEquipmentStunSpear__xeno_zapper__type": "classes/CoreUObject/FGEquipmentStunSpear",
 	"common_type__common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type": "classes/CoreUObject/FGItemDescriptor",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__type": "classes/CoreUObject/FGItemDescriptor",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type": "classes/CoreUObject/FGItemDescriptor",

diff --git a/generated-types/1.0/classes/CoreUObject/FGEquipmentStunSpear.ts b/generated-types/1.0/classes/CoreUObject/FGEquipmentStunSpear.ts
@@ -14,11 +14,14 @@ import {
 } from '../../../common/common/scalar';
 
 import {
-	mDamageTypes__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
+	common_base__FGEquipmentStunSpear__base__type,
+	common_base__FGEquipmentStunSpear__type,
+	common_base__FGEquipmentStunSpear__xeno_zapper__type,
+} from '../../../common/classes/CoreUObject/FGEquipmentStunSpear';
 
-export type FGEquipmentStunSpear__type = FGEquipmentStunSpear__base__type & {
+import {NativeClass__type} from '../../../common/common/unassigned';
+
+export type FGEquipmentStunSpear__type = FGEquipmentStunSpear__merged__type & {
 	mSecondSwingMontageList: {
 		Montages: [
 			{
@@ -145,21 +148,25 @@ export type FGEquipmentStunSpear__type = FGEquipmentStunSpear__base__type & {
 			StringStartsWith<'/Game/WwiseAudio/Events/Equipment/ShockBaton/'>
 		>;
 	};
-	mDamageTypes: mDamageTypes__type;
-	mArmAnimation: 'AE_StunSpear';
 };
 
-export type FGEquipmentStunSpear__base__type = FGEquipment__base__type & {
-	mDamageTypes: mDamageTypes__type;
-	mSecondSwingMinDelay: decimal_string__type;
-	mSecondSwingMaxDelay: decimal_string__type;
-	mSecondSwingUseCoolDown: decimal_string__type;
-	mAttackDistance: decimal_string__type;
-	mAttackSweepRadius: decimal_string__type;
-};
+export type FGEquipmentStunSpear__base__type =
+	FGEquipmentStunSpear__base__merged__type & {
+		mSecondSwingMinDelay: decimal_string__type;
+		mSecondSwingMaxDelay: decimal_string__type;
+		mSecondSwingUseCoolDown: decimal_string__type;
+	};
+
+export type FGEquipmentStunSpear__base__merged__type =
+	common_base__FGEquipmentStunSpear__base__type &
+		FGEquipment__base__type;
+
+export type FGEquipmentStunSpear__merged__type =
+	common_base__FGEquipmentStunSpear__type &
+		FGEquipmentStunSpear__base__type;
 
 export type FGEquipmentStunSpear__xeno_zapper__type =
-	FGEquipmentStunSpear__base__type & {
+	FGEquipmentStunSpear__xeno_zapper__merged__type & {
 		mFirstSwingMontageList: {
 			Montages: [
 				{
@@ -242,8 +249,6 @@ export type FGEquipmentStunSpear__xeno_zapper__type =
 				}[],
 			];
 		};
-		mDamageTypes: mDamageTypes__type;
-		mArmAnimation: 'AE_ShockShank';
 		mEquipMontage: {
 			Montages: [
 				{
@@ -299,6 +304,10 @@ export type FGEquipmentStunSpear__xeno_zapper__type =
 		};
 	};
 
+export type FGEquipmentStunSpear__xeno_zapper__merged__type =
+	common_base__FGEquipmentStunSpear__xeno_zapper__type &
+		FGEquipmentStunSpear__base__type;
+
 export type FGEquipmentStunSpear__NativeClass =
 	NativeClass__type & {
 		Classes: [

diff --git a/generated-types/common/classes/CoreUObject/FGEquipmentStunSpear.ts b/generated-types/common/classes/CoreUObject/FGEquipmentStunSpear.ts
@@ -0,0 +1,22 @@
+import {mDamageTypes__type} from '../../common/unassigned';
+
+import {decimal_string__type} from '../../common/scalar';
+
+import {common_base__FGEquipment__base__type} from './FGEquipment';
+
+export type common_base__FGEquipmentStunSpear__type =
+	common_base__FGEquipmentStunSpear__base__type & {
+		mArmAnimation: 'AE_StunSpear';
+	};
+
+export type common_base__FGEquipmentStunSpear__base__type =
+	common_base__FGEquipment__base__type & {
+		mDamageTypes: mDamageTypes__type;
+		mAttackDistance: decimal_string__type;
+		mAttackSweepRadius: decimal_string__type;
+	};
+
+export type common_base__FGEquipmentStunSpear__xeno_zapper__type =
+	common_base__FGEquipmentStunSpear__base__type & {
+		mArmAnimation: 'AE_ShockShank';
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -41,6 +41,12 @@ import {
 
 import {common_base__FGEquipment__base__type} from '../classes/CoreUObject/FGEquipment';
 
+import {
+	common_base__FGEquipmentStunSpear__base__type,
+	common_base__FGEquipmentStunSpear__type,
+	common_base__FGEquipmentStunSpear__xeno_zapper__type,
+} from '../classes/CoreUObject/FGEquipmentStunSpear';
+
 import {common_base__FGBuildableDroneStation__type} from '../classes/CoreUObject/FGBuildableDroneStation';
 
 import {
@@ -212,6 +218,9 @@ export type faux_14__type = class__type & {
 export type faux_15__type = class__type & {
 	faux: 'common-base--FGEquipment--base';
 	FGSchematic__mUnlocks_mSchematics__mSchematics?: common_base__FGEquipment__base__type;
+	FGEquipmentStunSpear_base?: common_base__FGEquipmentStunSpear__base__type;
+	FGEquipmentStunSpear?: common_base__FGEquipmentStunSpear__type;
+	FGEquipmentStunSpear_xeno_zapper?: common_base__FGEquipmentStunSpear__xeno_zapper__type;
 };
 
 export type faux_16__type = class__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGEquipmentStunSpear.ts b/generated-types/update8/classes/CoreUObject/FGEquipmentStunSpear.ts
@@ -1,37 +1,46 @@
 import {FGEquipment__base__type} from './FGEquipment';
 
-import {
-	mDamageTypes__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
-
 import {
 	integer_string__type,
 	decimal_string__type,
 } from '../../../common/common/scalar';
 
-export type FGEquipmentStunSpear__type = FGEquipmentStunSpear__base__type & {
-	mDamageTypes?: mDamageTypes__type;
-	mArmAnimation?: 'AE_StunSpear';
+import {
+	common_base__FGEquipmentStunSpear__base__type,
+	common_base__FGEquipmentStunSpear__type,
+	common_base__FGEquipmentStunSpear__xeno_zapper__type,
+} from '../../../common/classes/CoreUObject/FGEquipmentStunSpear';
+
+import {NativeClass__type} from '../../../common/common/unassigned';
+
+export type FGEquipmentStunSpear__type = FGEquipmentStunSpear__merged__type & {
 	mRandomAttackAnim: integer_string__type;
 	mRandomEquipAnim: integer_string__type;
 };
 
-export type FGEquipmentStunSpear__base__type = FGEquipment__base__type & {
-	mDamageTypes: mDamageTypes__type;
-	mSecondSwingMaxTime: decimal_string__type;
-	mSecondSwingCooldDownTime: decimal_string__type;
-	mAttackDistance: decimal_string__type;
-	mAttackSweepRadius: decimal_string__type;
-};
+export type FGEquipmentStunSpear__base__type =
+	FGEquipmentStunSpear__base__merged__type & {
+		mSecondSwingMaxTime: decimal_string__type;
+		mSecondSwingCooldDownTime: decimal_string__type;
+	};
+
+export type FGEquipmentStunSpear__base__merged__type =
+	common_base__FGEquipmentStunSpear__base__type &
+		FGEquipment__base__type;
+
+export type FGEquipmentStunSpear__merged__type =
+	common_base__FGEquipmentStunSpear__type &
+		FGEquipmentStunSpear__base__type;
 
 export type FGEquipmentStunSpear__xeno_zapper__type =
-	FGEquipmentStunSpear__base__type & {
-		mDamageTypes?: mDamageTypes__type;
-		mArmAnimation?: 'AE_ShockShank';
+	FGEquipmentStunSpear__xeno_zapper__merged__type & {
 		mPunchAnimationWeight: decimal_string__type;
 	};
 
+export type FGEquipmentStunSpear__xeno_zapper__merged__type =
+	common_base__FGEquipmentStunSpear__xeno_zapper__type &
+		FGEquipmentStunSpear__base__type;
+
 export type FGEquipmentStunSpear__NativeClass =
 	NativeClass__type & {
 		Classes: [

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -1317,23 +1317,27 @@
 				}
 			}
 		},
+		"FGEquipmentStunSpear--base--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGEquipmentStunSpear--base"
+				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				}
+			]
+		},
 		"FGEquipmentStunSpear--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipment--base",
+			"$ref": "#/$defs/FGEquipmentStunSpear--base--merged",
 			"required": [
 				"mFirstSwingMontageList",
 				"mSecondSwingMontageList",
-				"mDamageTypes",
 				"mSecondSwingMinDelay",
 				"mSecondSwingMaxDelay",
-				"mSecondSwingUseCoolDown",
-				"mAttackDistance",
-				"mAttackSweepRadius"
+				"mSecondSwingUseCoolDown"
 			],
 			"properties": {
-				"mDamageTypes": {
-					"$ref": "common.schema.json#/$defs/mDamageTypes"
-				},
 				"mSecondSwingMinDelay": {
 					"$ref": "common.schema.json#/$defs/decimal-string"
 				},
@@ -1342,12 +1346,6 @@
 				},
 				"mSecondSwingUseCoolDown": {
 					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mAttackDistance": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mAttackSweepRadius": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
 				}
 			}
 		},
@@ -1393,9 +1391,19 @@
 			"type": "string",
 			"enum": ["LowCharged", "MediumCharged", "FullyCharged"]
 		},
+		"FGEquipmentStunSpear--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGEquipmentStunSpear"
+				},
+				{
+					"$ref": "#/$defs/FGEquipmentStunSpear--base"
+				}
+			]
+		},
 		"FGEquipmentStunSpear": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipmentStunSpear--base",
+			"$ref": "#/$defs/FGEquipmentStunSpear--merged",
 			"unevaluatedProperties": false,
 			"properties": {
 				"mSecondSwingMontageList": {
@@ -1682,19 +1690,22 @@
 							}
 						}
 					}
-				},
-				"mDamageTypes": {
-					"$ref": "common.schema.json#/$defs/mDamageTypes"
-				},
-				"mArmAnimation": {
-					"type": "string",
-					"const": "AE_StunSpear"
 				}
 			}
 		},
+		"FGEquipmentStunSpear--xeno-zapper--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGEquipmentStunSpear--xeno-zapper"
+				},
+				{
+					"$ref": "#/$defs/FGEquipmentStunSpear--base"
+				}
+			]
+		},
 		"FGEquipmentStunSpear--xeno-zapper": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipmentStunSpear--base",
+			"$ref": "#/$defs/FGEquipmentStunSpear--xeno-zapper--merged",
 			"unevaluatedProperties": false,
 			"properties": {
 				"mFirstSwingMontageList": {
@@ -1853,13 +1864,6 @@
 						}
 					}
 				},
-				"mDamageTypes": {
-					"$ref": "common.schema.json#/$defs/mDamageTypes"
-				},
-				"mArmAnimation": {
-					"type": "string",
-					"const": "AE_ShockShank"
-				},
 				"mEquipMontage": {
 					"type": "string",
 					"minLength": 1,

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -2623,6 +2623,47 @@
 				}
 			}
 		},
+		"common-base--FGEquipmentStunSpear--base": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGEquipment--base",
+			"required": [
+				"mDamageTypes",
+				"mAttackDistance",
+				"mAttackSweepRadius"
+			],
+			"properties": {
+				"mDamageTypes": {
+					"$ref": "common.schema.json#/$defs/mDamageTypes"
+				},
+				"mAttackDistance": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mAttackSweepRadius": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				}
+			}
+		},
+		"common-base--FGEquipmentStunSpear": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGEquipmentStunSpear--base",
+			"required": ["mArmAnimation"],
+			"properties": {
+				"mArmAnimation": {
+					"type": "string",
+					"const": "AE_StunSpear"
+				}
+			}
+		},
+		"common-base--FGEquipmentStunSpear--xeno-zapper": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGEquipmentStunSpear--base",
+			"properties": {
+				"mArmAnimation": {
+					"type": "string",
+					"const": "AE_ShockShank"
+				}
+			}
+		},
 		"faux-1": {
 			"type": "object",
 			"$ref": "#/$defs/class",
@@ -2944,6 +2985,15 @@
 				},
 				"FGSchematic__mUnlocks_mSchematics__mSchematics": {
 					"$ref": "#/$defs/common-base--FGEquipment--base"
+				},
+				"FGEquipmentStunSpear_base": {
+					"$ref": "#/$defs/common-base--FGEquipmentStunSpear--base"
+				},
+				"FGEquipmentStunSpear": {
+					"$ref": "#/$defs/common-base--FGEquipmentStunSpear"
+				},
+				"FGEquipmentStunSpear_xeno_zapper": {
+					"$ref": "#/$defs/common-base--FGEquipmentStunSpear--xeno-zapper"
 				}
 			}
 		},