Merge branch 'master' into 'master'

[H.FIX] SteelBelt and HeelBinders - New Slot for Neck Cuff Collar (Item N.Restraints)

See merge request BondageProjects/Bondage-College!5533

BondageClub/Assets/Female3DCG/AssetStrings.csv

@@ -6702,19 +6702,19 @@ ItemAddonCeilingNeckCuffLoose,Loose chain
 ItemAddonCeilingNeckCuffStrict,Shortened chain
 ItemAddonCeilingNeckCuffSetLoose,SourceCharacter puts a longer chain on the DestinationCharacter neck cuff.
 ItemAddonCeilingNeckCuffSetStrict,SourceCharacter shortens the DestinationCharacter chain's neck cuff.
-ItemNeckMCuffCollarSelectBase,Metal cuff collar attachments main menu:
-ItemNeckMCuffCollarModuleHandcuffs,Handcuffs
-ItemNeckMCuffCollarSelectHandcuffs,Handcuffs option:
-ItemNeckMCuffCollarOptionh0,No Handcuffs
-ItemNeckMCuffCollarOptionh1,Attach handcuffs
-ItemNeckMCuffCollarModuleLeash,Leash
-ItemNeckMCuffCollarSelectLeash,Leash option:
-ItemNeckMCuffCollarOptionl0,No leash
-ItemNeckMCuffCollarOptionl1,Attach Leash
-ItemNeckMCuffCollarSeth0,SourceCharacter removes a wrist handcuffs and linked chain from the DestinationCharacter neck cuff device.
-ItemNeckMCuffCollarSeth1,SourceCharacter installs a chain link to the DestinationCharacter neck and lock TargetPronounPossessive wrists with handcuffs.
-ItemNeckMCuffCollarSetl0,SourceCharacter removes leash from the DestinationCharacter neck cuff device.
-ItemNeckMCuffCollarSetl1,SourceCharacter attaches a chain leash to the DestinationCharacter neck cuff device.
+ItemNeckRestraintsMCuffCollarSelectBase,Metal cuff collar attachments main menu:
+ItemNeckRestraintsMCuffCollarModuleHandcuffs,Handcuffs
+ItemNeckRestraintsMCuffCollarSelectHandcuffs,Handcuffs option:
+ItemNeckRestraintsMCuffCollarOptionh0,No Handcuffs
+ItemNeckRestraintsMCuffCollarOptionh1,Attach handcuffs
+ItemNeckRestraintsMCuffCollarModuleLeash,Leash
+ItemNeckRestraintsMCuffCollarSelectLeash,Leash option:
+ItemNeckRestraintsMCuffCollarOptionl0,No leash
+ItemNeckRestraintsMCuffCollarOptionl1,Attach Leash
+ItemNeckRestraintsMCuffCollarSeth0,SourceCharacter removes a wrist handcuffs and linked chain from the DestinationCharacter neck cuff device.
+ItemNeckRestraintsMCuffCollarSeth1,SourceCharacter installs a chain link to the DestinationCharacter neck and lock TargetPronounPossessive wrists with handcuffs.
+ItemNeckRestraintsMCuffCollarSetl0,SourceCharacter removes leash from the DestinationCharacter neck cuff device.
+ItemNeckRestraintsMCuffCollarSetl1,SourceCharacter attaches a chain leash to the DestinationCharacter neck cuff device.
 ItemHoodHalloIIISelectBase,Glow in the dark: Clover Masks!
 ItemHoodHalloIIIModuleMask,Mask type
 ItemHoodHalloIIISelectMask,Choose your favorite mask to watch TV:

BondageClub/Assets/Female3DCG/Female3DCG.csv

@@ -1385,7 +1385,6 @@ ItemNeck,LeatherCorsetCollar,Leather Corset Collar Gag
 ItemNeck,LeatherDeluxeCollar, Leather Deluxe Collar
 ItemNeck,LoveLeatherCollar,Lover Leather Collar
 ItemNeck,MaidCollar,Maid Collar
-ItemNeck,MCuffCollar,Metal Cuff Collar
 ItemNeck,NeckRope,Neck Rope
 ItemNeck,NobleCorsetCollar,Noble Corset Collar
 ItemNeck,NylonCollar,Nylon Collar
@@ -1437,6 +1436,7 @@ ItemNeckRestraints,CollarLeash,Leash
 ItemNeckRestraints,CollarRopeLong,Long Rope
 ItemNeckRestraints,CollarRopeMedium,Medium Rope
 ItemNeckRestraints,CollarRopeShort,Short Rope
+ItemNeckRestraints,MCuffCollar,Metal Cuff Collar
 ItemNeckRestraints,PetPost,Pet Sign
 ItemNeckRestraints,Post,Hitching Post
 ItemNeckRestraints,Bedchain,Chain to Bed

BondageClub/Assets/Female3DCG/Female3DCG.js

@@ -9894,6 +9894,8 @@ var AssetFemale3DCG = [
 					Spread: "Spread",
 					Kneel: PoseType.HIDE,
 					KneelingSpread: PoseType.HIDE,
+					Hogtied: PoseType.HIDE,
+					AllFours: PoseType.HIDE,
 				},
 				Layer: [
 					{ Name: "Cuffs", AllowColorize: true },
@@ -10140,6 +10142,8 @@ var AssetFemale3DCG = [
 					Spread: "Spread",
 					Kneel: PoseType.HIDE,
 					KneelingSpread: PoseType.HIDE,
+					Hogtied: PoseType.HIDE,
+					AllFours: PoseType.HIDE,
 				},
 				Layer: [
 					{ Name: "Cuffs", AllowColorize: true },
@@ -10248,6 +10252,8 @@ var AssetFemale3DCG = [
 					Spread: "Spread",
 					Kneel: PoseType.HIDE,
 					KneelingSpread: PoseType.HIDE,
+					Hogtied: PoseType.HIDE,
+					AllFours: PoseType.HIDE,
 				},
 				Layer: [
 					{ Name: "Cuffs", AllowColorize: true },
@@ -10354,6 +10360,8 @@ var AssetFemale3DCG = [
 					Spread: "Spread",
 					Kneel: PoseType.HIDE,
 					KneelingSpread: PoseType.HIDE,
+					Hogtied: PoseType.HIDE,
+					AllFours: PoseType.HIDE,
 				},
 				Layer: [
 					{ Name: "Cuffs", AllowColorize: true },
@@ -22689,6 +22697,8 @@ var AssetFemale3DCG = [
 							LegsClosed: "LegsClosed",
 							Spread: "Spread",
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						AllowColorize: true,
 					},
@@ -22700,6 +22710,8 @@ var AssetFemale3DCG = [
 							LegsClosed: "LegsClosed",
 							Spread: "Spread",
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						CopyLayerColor: "Cuffs",
 					},
@@ -22725,6 +22737,8 @@ var AssetFemale3DCG = [
 							LegsClosed: "LegsClosed",
 							Spread: PoseType.HIDE,
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						CreateLayerTypes: ["r"],
 						AllowTypes: { r: 2 },
@@ -22739,6 +22753,8 @@ var AssetFemale3DCG = [
 							LegsClosed: "LegsClosed",
 							Spread: PoseType.HIDE,
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						CreateLayerTypes: ["r"],
 						AllowTypes: { r: 3 },
@@ -22752,6 +22768,8 @@ var AssetFemale3DCG = [
 							LegsClosed: PoseType.HIDE,
 							Spread: "Spread",
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						CreateLayerTypes: ["r"],
 						AllowTypes: { r: [4, 5, 6, 7] },
@@ -22766,6 +22784,8 @@ var AssetFemale3DCG = [
 							LegsClosed: PoseType.HIDE,
 							Spread: "Spread",
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						CreateLayerTypes: ["r"],
 						AllowTypes: { r: 6 },
@@ -22780,6 +22800,8 @@ var AssetFemale3DCG = [
 							LegsClosed: PoseType.HIDE,
 							Spread: "Spread",
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						CreateLayerTypes: ["r"],
 						AllowTypes: { r: 7 },
@@ -22795,6 +22817,8 @@ var AssetFemale3DCG = [
 							LegsClosed: "LegsClosed",
 							Spread: "Spread",
 							Kneel: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+							AllFours: PoseType.HIDE,
 						},
 						AllowColorize: true,
 					},
@@ -28891,6 +28915,7 @@ var AssetFemale3DCG = [
 				Name: "SteelBelt",
 				InventoryID: 1224,
 				Fetish: ["Metal"],
+				IsRestraint: true,
 				Top: 366,
 				Left: 0,
 				Value: 55,
@@ -30305,6 +30330,7 @@ var AssetFemale3DCG = [
 				Name: "SteelBelt",
 				InventoryID: 1224,
 				Fetish: ["Metal"],
+				IsRestraint: true,
 				Top: 366,
 				Left: 0,
 				Value: -1,
@@ -40046,119 +40072,6 @@ var AssetFemale3DCG = [
 					{ Name: "Lock", Priority: 34, LockLayer: true, AllowColorize: true },
 				],
 			},
-			{
-				Name: "MCuffCollar",
-				InventoryID: 1228,
-				Priority: 41,
-				Value: 46,
-				BuyGroup: "MCuffCollar",
-				Left: 124,
-				Top: 178,
-				Difficulty: 30,
-				Time: 15,
-				DefaultColor: ["#A0A0A0", "#909090", "#909090", "#A0A0A0", "#9F8937"],
-				Extended: true,
-				AllowLock: true,
-				AllowTighten: true,
-				DrawLocks: false,
-				Audio: "MetalCuffs",
-				ExpressionTrigger: [
-					{ Name: "Soft", Group: "Eyebrows", Timer: 15 },
-					{ Name: "Shy", Group: "Eyes", Timer: 15 },
-					{ Name: "Low", Group: "Blush", Timer: 15 },
-				],
-				Layer: [
-					{ Name: "Collar", AllowColorize: true },
-					{
-						Name: "Handcuffs",
-						CreateLayerTypes: ["h"],
-						AllowTypes: { h: 1 },
-						AllowColorize: true,
-					},
-					{
-						Name: "HChains",
-						CreateLayerTypes: ["h"],
-						AllowTypes: { h: 1 },
-						AllowColorize: true,
-					},
-					{
-						Name: "HBack",
-						Priority: 5,
-						CreateLayerTypes: ["h"],
-						AllowTypes: { h: 1 },
-						CopyLayerColor: "Handcuffs",
-					},
-					{
-						Name: "Leash",
-						ParentGroup: {},
-						PoseMapping: {
-							BackBoxTie: PoseType.DEFAULT,
-							BackCuffs: PoseType.DEFAULT,
-							BackElbowTouch: PoseType.DEFAULT,
-							OverTheHead: PoseType.DEFAULT,
-							TapedHands: PoseType.DEFAULT,
-							Yoked: PoseType.DEFAULT,
-							AllFours: PoseType.HIDE,
-							Hogtied: PoseType.HIDE,
-						},
-						CreateLayerTypes: ["l"],
-						AllowTypes: { l: 1 },
-						AllowColorize: true,
-					},
-					{
-						Name: "Handle",
-						ParentGroup: {},
-						PoseMapping: {
-							BackBoxTie: PoseType.DEFAULT,
-							BackCuffs: PoseType.DEFAULT,
-							BackElbowTouch: PoseType.DEFAULT,
-							OverTheHead: PoseType.DEFAULT,
-							TapedHands: PoseType.DEFAULT,
-							Yoked: PoseType.DEFAULT,
-							AllFours: PoseType.HIDE,
-							Hogtied: PoseType.HIDE,
-						},
-						CreateLayerTypes: ["l"],
-						AllowTypes: { l: 1 },
-						AllowColorize: true,
-					},
-					{
-						Name: "LeashHog",
-						ParentGroup: {},
-						PoseMapping: {
-							BackBoxTie: PoseType.HIDE,
-							BackCuffs: PoseType.HIDE,
-							BackElbowTouch: PoseType.HIDE,
-							OverTheHead: PoseType.HIDE,
-							TapedHands: PoseType.HIDE,
-							Yoked: PoseType.HIDE,
-							AllFours: "AllFours",
-							Hogtied: "Hogtied",
-						},
-						CreateLayerTypes: ["l"],
-						AllowTypes: { l: 1 },
-						AllowColorize: true,
-						CopyLayerColor: "Leash",
-					},
-					{
-						Name: "HandleHog",
-						ParentGroup: {},
-						PoseMapping: {
-							BackBoxTie: PoseType.HIDE,
-							BackCuffs: PoseType.HIDE,
-							BackElbowTouch: PoseType.HIDE,
-							OverTheHead: PoseType.HIDE,
-							TapedHands: PoseType.HIDE,
-							Yoked: PoseType.HIDE,
-							AllFours: "AllFours",
-							Hogtied: "Hogtied",
-						},
-						CreateLayerTypes: ["l"],
-						AllowTypes: { l: 1 },
-						CopyLayerColor: "Handle",
-					},
-				],
-			},
 			{
 				Name: "ChainCollar",
 				InventoryID: 1233,
@@ -40944,6 +40857,120 @@ var AssetFemale3DCG = [
 				AllowEffect: [E.Leash, E.Block, E.IsLeashed],
 				Layer: [{ Name: "Chain" }, { Name: "Padlock" }],
 			},
+			{
+				Name: "MCuffCollar",
+				InventoryID: 1228,
+				IsRestraint: true,
+				Priority: 41,
+				Value: 46,
+				BuyGroup: "MCuffCollar",
+				Left: 124,
+				Top: 178,
+				Difficulty: 5,
+				Time: 15,
+				DefaultColor: ["#A0A0A0", "#909090", "#909090", "#A0A0A0", "#9F8937"],
+				Extended: true,
+				AllowLock: true,
+				AllowTighten: true,
+				DrawLocks: false,
+				Audio: "MetalCuffs",
+				ExpressionTrigger: [
+					{ Name: "Soft", Group: "Eyebrows", Timer: 15 },
+					{ Name: "Shy", Group: "Eyes", Timer: 15 },
+					{ Name: "Low", Group: "Blush", Timer: 15 },
+				],
+				Layer: [
+					{ Name: "Collar", AllowColorize: true },
+					{
+						Name: "Handcuffs",
+						CreateLayerTypes: ["h"],
+						AllowTypes: { h: 1 },
+						AllowColorize: true,
+					},
+					{
+						Name: "HChains",
+						CreateLayerTypes: ["h"],
+						AllowTypes: { h: 1 },
+						AllowColorize: true,
+					},
+					{
+						Name: "HBack",
+						Priority: 5,
+						CreateLayerTypes: ["h"],
+						AllowTypes: { h: 1 },
+						CopyLayerColor: "Handcuffs",
+					},
+					{
+						Name: "Leash",
+						ParentGroup: {},
+						PoseMapping: {
+							BackBoxTie: PoseType.DEFAULT,
+							BackCuffs: PoseType.DEFAULT,
+							BackElbowTouch: PoseType.DEFAULT,
+							OverTheHead: PoseType.DEFAULT,
+							TapedHands: PoseType.DEFAULT,
+							Yoked: PoseType.DEFAULT,
+							AllFours: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+						},
+						CreateLayerTypes: ["l"],
+						AllowTypes: { l: 1 },
+						AllowColorize: true,
+					},
+					{
+						Name: "Handle",
+						ParentGroup: {},
+						PoseMapping: {
+							BackBoxTie: PoseType.DEFAULT,
+							BackCuffs: PoseType.DEFAULT,
+							BackElbowTouch: PoseType.DEFAULT,
+							OverTheHead: PoseType.DEFAULT,
+							TapedHands: PoseType.DEFAULT,
+							Yoked: PoseType.DEFAULT,
+							AllFours: PoseType.HIDE,
+							Hogtied: PoseType.HIDE,
+						},
+						CreateLayerTypes: ["l"],
+						AllowTypes: { l: 1 },
+						AllowColorize: true,
+					},
+					{
+						Name: "LeashHog",
+						ParentGroup: {},
+						PoseMapping: {
+							BackBoxTie: PoseType.HIDE,
+							BackCuffs: PoseType.HIDE,
+							BackElbowTouch: PoseType.HIDE,
+							OverTheHead: PoseType.HIDE,
+							TapedHands: PoseType.HIDE,
+							Yoked: PoseType.HIDE,
+							AllFours: "AllFours",
+							Hogtied: "Hogtied",
+						},
+						CreateLayerTypes: ["l"],
+						AllowTypes: { l: 1 },
+						AllowColorize: true,
+						CopyLayerColor: "Leash",
+					},
+					{
+						Name: "HandleHog",
+						ParentGroup: {},
+						PoseMapping: {
+							BackBoxTie: PoseType.HIDE,
+							BackCuffs: PoseType.HIDE,
+							BackElbowTouch: PoseType.HIDE,
+							OverTheHead: PoseType.HIDE,
+							TapedHands: PoseType.HIDE,
+							Yoked: PoseType.HIDE,
+							AllFours: "AllFours",
+							Hogtied: "Hogtied",
+						},
+						CreateLayerTypes: ["l"],
+						AllowTypes: { l: 1 },
+						CopyLayerColor: "Handle",
+					},
+				],
+			},
 		],
 		Color: [
 			"Default",

BondageClub/Assets/Female3DCG/Female3DCGExtended.js

@@ -5032,47 +5032,6 @@ var AssetFemale3DCGExtended = {
 				},
 			],
 		}, // AsylumCollar
-		MCuffCollar: {
-			Archetype: ExtendedArchetype.MODULAR,
-			Modules: [
-				{
-					Name: "Handcuffs",
-					Key: "h",
-					Options: [
-						{ 
-							// None
-							Property: {}
-						},
-						{
-							// Cuffed
-							Property: {
-								Difficulty: 4,
-								SetPose: ["BaseUpper"],
-								Effect: [E.BlockWardrobe],
-							},
-						},
-					],
-				},
-				{
-					Name: "Leash",
-					Key: "l",
-					Options: [
-						{ 
-							// None
-							Property: {}
-						},
-						{
-							// Leashed
-							Property: {
-								Difficulty: 4,
-								Effect: [E.Leash,E.IsLeashed],
-							},
-						},
-					],
-				},
-			],
-			ChangeWhenLocked: false,
-		}, // MCuffCollar
 		ChainCollar: {
 			Archetype: ExtendedArchetype.TYPED,
 			Options: [{ Name: "LockBodyHeart" }, { Name: "LockBodyPlain" }],
@@ -5406,6 +5365,47 @@ var AssetFemale3DCGExtended = {
 			ChangeWhenLocked: false,
 			BaselineProperty: { Text: "Pet", Text2: "Leashing", Text3: "Post" },
 		}, //PetPost
+		MCuffCollar: {
+			Archetype: ExtendedArchetype.MODULAR,
+			Modules: [
+				{
+					Name: "Handcuffs",
+					Key: "h",
+					Options: [
+						{ 
+							// None
+							Property: {}
+						},
+						{
+							// Cuffed
+							Property: {
+								Difficulty: 4,
+								SetPose: ["BaseUpper"],
+								Effect: [E.BlockWardrobe],
+							},
+						},
+					],
+				},
+				{
+					Name: "Leash",
+					Key: "l",
+					Options: [
+						{ 
+							// None
+							Property: {}
+						},
+						{
+							// Leashed
+							Property: {
+								Difficulty: 4,
+								Effect: [E.Leash,E.IsLeashed],
+							},
+						},
+					],
+				},
+			],
+			ChangeWhenLocked: false,
+		}, // MCuffCollar
 	}, //ItemNeckRestraints
 	ItemHood: {
 		OldGasMask: {

BondageClub/Assets/Female3DCG/LayerNames.csv

@@ -2152,11 +2152,6 @@ ItemNeckLeatherDeluxeCollarRings,Edging
 ItemNeckMaidCollarBrooch,Brooch
 ItemNeckMaidCollarCollar,Collar
 ItemNeckMaidCollarFrills,Frills
-ItemNeckMCuffCollarCollar,Cuff collar
-ItemNeckMCuffCollarHandcuffs,Handcuffs
-ItemNeckMCuffCollarHChains,Handcuffs chains
-ItemNeckMCuffCollarLeash,Leash
-ItemNeckMCuffCollarHandle,Leash handle
 ItemNeckOrnateCollarCollar,Collar
 ItemNeckOrnateCollarGem,Gems
 ItemNeckPaddedBeltCollarBase,Base
@@ -2185,6 +2180,11 @@ ItemNeckRestraintsCollarRopeMediumPlate,Plate
 ItemNeckRestraintsCollarRopeMediumRope,Rope
 ItemNeckRestraintsCollarRopeShortPlate,Plate
 ItemNeckRestraintsCollarRopeShortRope,Rope
+ItemNeckRestraintsMCuffCollarCollar,Cuff collar
+ItemNeckRestraintsMCuffCollarHandcuffs,Handcuffs
+ItemNeckRestraintsMCuffCollarHChains,Handcuffs chains
+ItemNeckRestraintsMCuffCollarLeash,Leash
+ItemNeckRestraintsMCuffCollarHandle,Leash handle
 ItemNeckRestraintsPetPostChain,Chain
 ItemNeckRestraintsPetPostLeash,Leash
 ItemNeckRestraintsPetPostPaw,Sticker

BondageClub/Scripts/Audio.js

@@ -409,6 +409,7 @@ var AudioActions = [
 			"ItemArmsSteelBeltSeth1",
 			"ItemArmsSteelBeltSeth2",
 			"ItemArmsSteelBeltSeth3",
+			"ItemNeckRestraintsMCuffCollarSeth1",
 		].some(A => data.Content.includes(A)),
 		GetSoundEffect: () => "MetalCuffs"
 	},
@@ -417,6 +418,7 @@ var AudioActions = [
 			"ItemTorsoSteelBeltSeth0",
 			"ItemTorso2SteelBeltSeth0",
 			"ItemArmsSteelBeltSeth0",
+			"ItemNeckRestraintsMCuffCollarSeth0",
 		].some(A => data.Content.includes(A)),
 		GetSoundEffect: () => "CuffsMetal"
 	},