Merge branch 'master' into 'master'

Added Long Fishnet Stockings, 2 Collars and Bed Metal Cuffs

See merge request BondageProjects/Bondage-College!5244

BondageClub/Assets/Female3DCG/AssetStrings.csv

@@ -5656,4 +5656,11 @@ ItemFeetHeelBindersSetr3,SourceCharacter links DestinationCharacterName ankle cu
 ItemFeetHeelBindersSetr4,SourceCharacter links DestinationCharacterName ankle cuffs with a metal bar.
 ItemFeetHeelBindersSetr5,SourceCharacter spreads the DestinationCharacterName legs with a spread bar.
 ItemFeetHeelBindersSetr6,SourceCharacter suspends the spread bar and DestinationCharacterName is suspended upside down.
-ItemFeetHeelBindersSetr7,SourceCharacter chained the spread bar to the floor and DestinationCharacterName feet are stuck in place.
+ItemFeetHeelBindersSetr7,SourceCharacter chained the spread bar to the floor and DestinationCharacterName feet are stuck in place.
+ItemArmsBedMetalCuffsLeft,Left
+ItemArmsBedMetalCuffsRight,Right
+ItemArmsBedMetalCuffsBoth,Both
+ItemArmsBedMetalCuffsSelect,Select cuffs location.
+ItemArmsBedMetalCuffsSetLeft,SourceCharacter cuffs DestinationCharacter left arm to the bed.
+ItemArmsBedMetalCuffsSetRight,SourceCharacter cuffs DestinationCharacter right arm to the bed.
+ItemArmsBedMetalCuffsSetBoth,SourceCharacter cuffs DestinationCharacter both arms to the bed.

BondageClub/Assets/Female3DCG/Female3DCG.csv

@@ -733,6 +733,7 @@ ItemArms,WrappedBlanket,Wrapped Blanket
 ItemArms,WristShackles,Wrist Shackles
 ItemArms,Yoke,Yoke
 ItemArms,Zipties,Zip Ties
+ItemArms,BedMetalCuffs,Cuffed to Bed
 ItemBoots,,Feet
 ItemBoots,BalletHeels,Ballet Heels
 ItemBoots,BalletHeels1,Ballet Hi-Shoes
@@ -1287,6 +1288,8 @@ ItemNeck,SpikedChoker,Spiked Choker
 ItemNeck,SteelPostureCollar,Steel Collar
 ItemNeck,StrictPostureCollar,Strict Posture Collar
 ItemNeck,TechnoCollar,Techno Collar
+ItemNeck,MoonCollar,Benim ayım
+ItemNeck,SunCollar,Benim Güneşim
 ItemNeckAccessories,,Collar
 ItemNeckAccessories,CollarAutoShockUnit,Automatic Shock Unit
 ItemNeckAccessories,CollarBell,Bell
@@ -1668,6 +1671,7 @@ Socks,Stockings3,Silky Stockings
 Socks,Stockings4,Fishnet Stockings
 Socks,VSocks1,Vinyl Socks
 Socks,YuletideVelvetWarmth,Yuletide Velvet Warmth
+Socks,LongFishnets,Long Fishnet Stockings
 SocksLeft,,Left Leg
 SocksLeft,CowPrintedSocks,Cow Printed Socks
 SocksLeft,FootlessSocks1,Footless Socks

BondageClub/Assets/Female3DCG/Female3DCG.js

@@ -6442,6 +6442,15 @@ var AssetFemale3DCG = [
 					{ Name: "Lock", AllowTypes: { typed: 3 } },
 				],
 			},
+			{
+				Name: "LongFishnets",
+				DynamicGroupName: "Socks",
+				CopyConfig: {
+					GroupName: "Socks",
+					AssetName: "LongFishnets",
+					BuyGroup: true,
+				},
+			}
 		],
 
 		Color: [
@@ -8627,6 +8636,18 @@ var AssetFemale3DCG = [
 					{ Name: "Guards", AllowColorize: true },
 				],
 			},
+			{
+				Name: "LongFishnets",
+				InventoryID: 1185,
+				Fetish: ["Nylon"],
+				Value: 15,
+				BuyGroup: "LongFishnets",
+				Left: {
+					[PoseType.DEFAULT] : 75,
+					KneelingSpread: 105,
+					Hogtied: 125,
+				}
+			},
 		],
 		Color: [
 			"Default",
@@ -13084,7 +13105,7 @@ var AssetFemale3DCG = [
 				Priority: 56,
 				BuyGroup: "Onihorns",
 				Top: 5,
-				Left: 125,
+				Left: 127,
 				BodyCosplay: true,
 				Extended: true,
 				Layer: [
@@ -30686,6 +30707,47 @@ var AssetFemale3DCG = [
 					},
 				],
 			},
+			{
+				Name: "BedMetalCuffs",
+				InventoryID: 1182,
+				Fetish: ["Metal"],
+				Value: 20,
+				Difficulty: 6,
+				Random: false,
+				IsRestraint: true,
+				ParentGroup: null,
+				Audio: "MetalCuffs",
+				SetPose: ["Yoked"],
+				Prerequisite: ["OnBed"],
+				Effect: [E.Block, E.BlockWardrobe, E.Freeze],
+				Block: ["ItemDevices"],
+				Left: -3,
+				Top: 40,
+				Extended: true,
+				DefaultColor: ["#999999","#999999"],
+				Layer: [
+					{
+						Name: "Leftundercuff",
+						Priority: 2,
+						AllowTypes: { typed: [0, 2]},
+					},
+					{
+						Name: "Leftcuff",
+						CopyLayerColor: "Leftundercuff",
+						AllowTypes: { typed: [0, 2]},
+					},
+					{
+						Name: "Rightundercuff",
+						Priority: 2,
+						AllowTypes: { typed: [1, 2]},
+					},
+					{
+						Name: "Rightcuff",
+						CopyLayerColor: "Rightundercuff",
+						AllowTypes: { typed: [1, 2]},
+					}
+				]
+			},
 		],
 		Color: [
 			"Default",
@@ -33692,6 +33754,68 @@ var AssetFemale3DCG = [
 					},
 				],
 			},
+			{
+				Name: "MoonCollar",
+				InventoryID: 1186,
+				Fetish: ["Metal"],
+				Value: 30,
+				Difficulty: 50,
+				Top: 159,
+				Time: 5,
+				AllowLock: true,
+				DefaultColor: ["#7E7E7E", "#961006", "#198E9D"],
+				Layer: [
+					{
+						Name: "Base",
+						AllowColorize: true,
+					},
+					{
+						Name: "Suns",
+						AllowColorize: true,
+					},
+					{
+						Name: "Centermoon",
+						AllowColorize: true,
+					},
+					{
+						Name: "Lock",
+						AllowColorize: false,
+						LockLayer: true,
+						Priority: 5
+					}
+				],
+			},
+			{
+				Name: "SunCollar",
+				InventoryID: 1187,
+				Fetish: ["Metal"],
+				Value: 30,
+				Difficulty: 50,
+				Top: 159,
+				Time: 5,
+				AllowLock: true,
+				DefaultColor: ["#7E7E7E", "#198E9D", "#961006"],
+				Layer: [
+					{
+						Name: "Base",
+						AllowColorize: true,
+					},
+					{
+						Name: "Moons",
+						AllowColorize: true,
+					},
+					{
+						Name: "Centersun",
+						AllowColorize: true,
+					},
+					{
+						Name: "Lock",
+						AllowColorize: false,
+						LockLayer: true,
+						Priority: 5
+					}
+				],
+			},
 		],
 		Color: [
 			"Default",

BondageClub/Assets/Female3DCG/Female3DCGExtended.js

@@ -3976,6 +3976,21 @@ var AssetFemale3DCGExtended = {
 			],
 			DrawImages: false,
 		}, // Collar Handcuffs
+		BedMetalCuffs: {
+			Archetype: ExtendedArchetype.TYPED,
+			Options: [
+				{
+					Name: "Left",
+				},
+				{
+					Name: "Right",
+				},
+				{
+					Name: "Both",
+				},
+			],
+			DrawImages: false,
+		}, // BedMetalCuffs
 	}, // ItemArms
 	ItemNeck: {
 		ShinySteelCollar: {

BondageClub/Assets/Female3DCG/LayerNames.csv

@@ -718,6 +718,8 @@ ItemArmsWristShacklesChain,Chain
 ItemArmsWristShacklesCuffs,Cuffs
 ItemArmsYokeBars,Bars
 ItemArmsYokeStraps,Straps
+ItemArmsBedMetalCuffsLeftundercuff,Left
+ItemArmsBedMetalCuffsRightundercuff,Right
 ItemBootsFuturisticHeels2Cuffs,Cuffs
 ItemBootsFuturisticHeels2Display,Display
 ItemBootsFuturisticHeels2Lock,Lock
@@ -1893,6 +1895,12 @@ ItemNeckSpikedChokerShine,Shine
 ItemNeckSpikedChokerSpikes,Spikes
 ItemNeckTechnoCollarSlenderCollarBase,Collar
 ItemNeckTechnoCollarSlenderCollarSides,Side Plates
+ItemNeckMoonCollarBase,Base
+ItemNeckMoonCollarSuns,Suns
+ItemNeckMoonCollarCentermoon,Center Moon
+ItemNeckMoonCollarBase,Base
+ItemNeckMoonCollarMoons,Moons
+ItemNeckMoonCollarCentersun,Center Sun
 ItemNipplesChainClampChain,Chain
 ItemNipplesChainClampClamp,Clamps
 ItemNipplesChainClampMetal,Metal