Merge branch 'master' into 'master'

Added HairFront 66-74, HairBack 79-84

See merge request BondageProjects/Bondage-College!5526

BondageClub/Assets/Female3DCG/AssetStrings.csv

@@ -1700,6 +1700,32 @@ HairBackHairBack78bOptionR2,None
 HairBackHairBack78bSelectBase,Select Option
 HairBackHairBack78bSelectLeft,Select Style
 HairBackHairBack78bSelectRight,Select Style
+HairBackHairBack80Select,Select Type.
+HairBackHairBack80SetBoth,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack80SetLeftOnly,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack80SetRightOnly,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack80Both,Both
+HairBackHairBack80LeftOnly,Left Only
+HairBackHairBack80RightOnly,Right Only
+HairBackHairBack82Select,Select Type.
+HairBackHairBack82SetLong,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack82SetMedium,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack82Long,Long
+HairBackHairBack82Medium,Medium
+HairBackHairBack83Select,Select Type.
+HairBackHairBack83SetBoth,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack83SetLeftOnly,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack83SetRightOnly,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack83Both,Both
+HairBackHairBack83LeftOnly,Left Only
+HairBackHairBack83RightOnly,Right Only
+HairBackHairBack84Select,Select Type.
+HairBackHairBack84SetBoth,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack84SetLeftOnly,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack84SetRightOnly,SourceCharacter changes DestinationCharacter hair.
+HairBackHairBack84Both,Both
+HairBackHairBack84LeftOnly,Left Only
+HairBackHairBack84RightOnly,Right Only
 HandAccessoryLeftRingsModuleIndex,Index
 HandAccessoryLeftRingsModuleMiddle,Middle finger
 HandAccessoryLeftRingsModulePinkie,Pinkie
@@ -6073,6 +6099,16 @@ HairFrontHairFront62bSelectBase,Select Options
 HairFrontHairFront62bSelectStyle,Select Style
 HairFrontHairFront62bSelectStrands,Select Strands
 HairFrontHairFront62bSelectExtra,Select Extras
+HairFrontHairFront67Select,Select Accessory.
+HairFrontHairFront67SetBraid,SourceCharacter changes DestinationCharacter hair.
+HairFrontHairFront67SetNoBraid,SourceCharacter changes DestinationCharacter hair.
+HairFrontHairFront67Braid,Braid
+HairFrontHairFront67NoBraid,No Braid
+HairFrontHairFront71Select,Select Accessory.
+HairFrontHairFront71SetBasic,SourceCharacter changes DestinationCharacter hair.
+HairFrontHairFront71SetTranslucent,SourceCharacter changes DestinationCharacter hair.
+HairFrontHairFront71Basic,Basic
+HairFrontHairFront71Translucent,Translucent
 PremiumMuzzleMouthSetCrossStraps,SourceCharacter adds extra straps to DestinationCharacter muzzle
 PremiumMuzzleMouthSetNormal,SourceCharacter turns DestinationCharacter muzzle back to normal.
 PremiumMuzzleMouthSetExtraMuzzle,SourceCharacter attaches an extra panel over DestinationCharacter muzzle.

BondageClub/Assets/Female3DCG/Female3DCG.csv

@@ -546,6 +546,12 @@ HairBack,HairBack77c,Style 77c
 HairBack,HairBack78,Style 78
 HairBack,HairBack78b,Style 78b
 HairBack,HairBack78c,Style 78c
+HairBack,HairBack79,Style 79
+HairBack,HairBack80,Style 80
+HairBack,HairBack81,Style 81
+HairBack,HairBack82,Style 82
+HairBack,HairBack83,Style 83
+HairBack,HairBack84,Style 84
 HairBack,HairNone,None
 HairFront,,Front Hair
 HairFront,HairFront1,Style 1
@@ -649,6 +655,15 @@ HairFront,HairFront62b,Style 62b
 HairFront,HairFront63,Style 63
 HairFront,HairFront64,Style 64
 HairFront,HairFront65,Style 65
+HairFront,HairFront66,Style 66
+HairFront,HairFront67,Style 67
+HairFront,HairFront68,Style 68
+HairFront,HairFront69,Style 69
+HairFront,HairFront70,Style 70
+HairFront,HairFront71,Style 71
+HairFront,HairFront72,Style 72
+HairFront,HairFront73,Style 73
+HairFront,HairFront74,Style 74
 HandAccessoryLeft,,Hand Accessory (Left)
 HandAccessoryLeft,CatsuitGloves,Catsuit Gloves
 HandAccessoryLeft,Claws,Claws

BondageClub/Assets/Female3DCG/Female3DCG.js

@@ -19802,6 +19802,109 @@ var AssetFemale3DCG = [
 					},
 				],
 			},
+			{
+				Name: "HairFront66",
+				Top: 30,
+				Left: 140
+			},
+			{
+				Name: "HairFront67",
+				Top: 30,
+				Left: 147,
+				Layer: [
+					{
+						Name: "main",
+						AllowTypes: { typed: 0 },
+					},
+					{
+						Name: "main2",
+						CopyLayerColor: "main",
+						AllowTypes: { typed: 1 },
+					},
+					{
+						Name: "streak",
+					}
+				]
+			},
+			{
+				Name: "HairFront68",
+				Top: 30,
+				Layer: [
+					{
+						Name: "Main",
+					},
+					{
+						Name: "Streak",
+					},
+				]
+			},
+			{
+				Name: "HairFront69",
+				Top: 30,
+				Layer: [
+					{
+						Name: "Main",
+					},
+					{
+						Name: "Streak",
+					},
+				]
+			},
+			{
+				Name: "HairFront70",
+				Top: 30,
+				Layer: [
+					{
+						Name: "Main",
+					},
+					{
+						Name: "Tone",
+					},
+				]
+			},
+			{
+				Name: "HairFront71",
+				Top: 30,
+				Layer: [
+					{
+						Name: "Main",
+						AllowTypes: { typed: 0 },
+					},
+					{
+						Name: "BMain",
+						CopyLayerColor: "Main",
+						AllowTypes: { typed: 1 },
+					},
+				]
+			},
+			{
+				Name: "HairFront72",
+				Top: 30,
+			},
+			{
+				Name: "HairFront73",
+				Top: 30,
+				Layer: [
+					{
+						Name: "Main",
+					},
+					{
+						Name: "Tone",
+					},
+				]
+			},
+			{
+				Name: "HairFront74",
+				Top: 30,
+				Layer: [
+					{
+						Name: "Main",
+					},
+					{
+						Name: "Streak",
+					},
+				]
+			},
 		],
 		Color: [
 			"#6a3628",
@@ -20913,6 +21016,184 @@ var AssetFemale3DCG = [
 					},
 				],
 			},
+			{
+				Name: "HairBack79",
+				Top: 170,
+				Left: 67,
+				Layer: [
+					{
+						Name: "Braid",
+					},
+					{
+						Name: "Band",
+					},
+				],
+			},
+			{
+				Name: "HairBack80",
+				Extended: true,
+				Layer: [
+					{
+						Name: "LeftBraid",
+						AllowTypes: { typed: [0, 1] },
+						Priority: 48,
+					},
+					{
+						Name: "LeftBack",
+						AllowTypes: { typed: [0, 1] },
+						CopyLayerColor: "LeftBraid",
+					},
+					{
+						Name: "LeftString",
+						AllowTypes: { typed: [0, 1] },
+						Priority: 48,
+					},
+					{
+						Name: "LeftRing",
+						AllowTypes: { typed: [0, 1] },
+						CopyLayerColor: "LeftString",
+						Priority: 48,
+					},
+					{
+						Name: "RightBraid",
+						AllowTypes: { typed: [0, 2] },
+						Priority: 48,
+					},
+					{
+						Name: "RightBack",
+						AllowTypes: { typed: [0, 2] },
+						CopyLayerColor: "RightBraid",
+					},
+					{
+						Name: "RightString",
+						AllowTypes: { typed: [0, 2] },
+						Priority: 48,
+					},
+					{
+						Name: "RightRing",
+						AllowTypes: { typed: [0, 2] },
+						CopyLayerColor: "RightString",
+						Priority: 48,
+					},
+				],
+			},
+			{
+				Name: "HairBack81",
+				Top: 0,
+				Layer: [
+					{
+						Name: "Main",
+					},
+					{
+						Name: "Tone",
+					},
+				],
+			},
+			{
+				Name: "HairBack82",
+				Top: 0,
+				Extended: true,
+				Layer: [
+					{
+						Name: "AFront",
+						AllowTypes: { typed: [0] },
+					},
+					{
+						Name: "ABack",
+						AllowTypes: { typed: [0] },
+						Priority: 4,
+					},
+					{
+						Name: "BFront",
+						CopyLayerColor: "AFront",
+						AllowTypes: { typed: [1] },
+					},
+					{
+						Name: "BBack",
+						CopyLayerColor: "ABack",
+						AllowTypes: { typed: [1] },
+						Priority: 4,
+					},
+				],
+			},
+			{
+				Name: "HairBack83",
+				Extended: true,
+				Layer: [
+					{
+						Name: "LeftFront",
+						AllowTypes: { typed: [0, 1] },
+						Priority: 48,
+					},
+					{
+						Name: "LeftBack",
+						AllowTypes: { typed: [0, 1] },
+						CopyLayerColor: "LeftFront",
+					},
+					{
+						Name: "LeftFrontStreak",
+						AllowTypes: { typed: [0, 1] },
+						Priority: 48,
+					},
+					{
+						Name: "LeftBackStreak",
+						AllowTypes: { typed: [0, 1] },
+						CopyLayerColor: "LeftFrontStreak",
+					},
+					{
+						Name: "LeftClip",
+						AllowTypes: { typed: [0, 1] },
+						Priority: 48,
+					},
+					{
+						Name: "RightFront",
+						AllowTypes: { typed: [0, 2] },
+						Priority: 48,
+					},
+					{
+						Name: "RightBack",
+						AllowTypes: { typed: [0, 2] },
+						CopyLayerColor: "RightFront",
+					},
+					{
+						Name: "RightFrontStreak",
+						AllowTypes: { typed: [0, 2] },
+						Priority: 48,
+					},
+					{
+						Name: "RightBackStreak",
+						AllowTypes: { typed: [0, 2] },
+						CopyLayerColor: "RightFrontStreak",
+					},
+					{
+						Name: "RightClip",
+						AllowTypes: { typed: [0, 2] },
+						Priority: 48,
+					},
+				],
+			},
+			{
+				Name: "HairBack84",
+				Extended: true,
+				Layer: [
+					{
+						Name: "Left",
+						AllowTypes: { typed: [0, 1] },
+					},
+					{
+						Name: "LeftStreak",
+						AllowTypes: { typed: [0, 1] },
+					},
+					{
+						Name: "Right",
+						AllowTypes: { typed: [0, 2] },
+					},
+					{
+						Name: "RightStreak",
+						AllowTypes: { typed: [0, 2] },
+					},
+				],
+			},
 		],
 		Color: [
 			"Default",

BondageClub/Assets/Female3DCG/Female3DCGExtended.js

@@ -1397,6 +1397,16 @@ var AssetFemale3DCGExtended = {
 				},
 			],
 		},
+		HairFront67: {
+			Archetype: ExtendedArchetype.TYPED,
+			DrawImages: false,
+			Options: [{ Name: "Braid" }, { Name: "NoBraid" }],
+		},
+		HairFront71: {
+			Archetype: ExtendedArchetype.TYPED,
+			DrawImages: false,
+			Options: [{ Name: "Basic" }, { Name: "Translucent" }],
+		},
 	},
 	HairBack: {
 		HairBack58: {
@@ -1571,6 +1581,26 @@ var AssetFemale3DCGExtended = {
 				},
 			],
 		},
+		HairBack80: {
+			Archetype: ExtendedArchetype.TYPED,
+			DrawImages: false,
+			Options: [{ Name: "Both" }, { Name: "LeftOnly" }, { Name: "RightOnly" }],
+		}, // HairBack80
+		HairBack82: {
+			Archetype: ExtendedArchetype.TYPED,
+			DrawImages: false,
+			Options: [{ Name: "Long" }, { Name: "Medium" }],
+		},// HairBack82
+		HairBack83: {
+			Archetype: ExtendedArchetype.TYPED,
+			DrawImages: false,
+			Options: [{ Name: "Both" }, { Name: "LeftOnly" }, { Name: "RightOnly" }],
+		}, // HairBack83
+		HairBack84: {
+			Archetype: ExtendedArchetype.TYPED,
+			DrawImages: false,
+			Options: [{ Name: "Both" }, { Name: "LeftOnly" }, { Name: "RightOnly" }],
+		}, // HairBack84
 	},
 	ClothAccessory: {
 		LeatherStraps: {

BondageClub/Assets/Female3DCG/LayerNames.csv

@@ -516,6 +516,26 @@ HairBackHairBack78bRightBraid,Right Braid
 HairBackHairBack78bLeftBraid,Left Braid
 HairBackHairBack78cMain,Main
 HairBackHairBack78cBraid,Braid
+HairBackHairBack79Band,Band
+HairBackHairBack79Braid,Braid
+HairBackHairBack80LeftBraid,Left Braid
+HairBackHairBack80LeftString,Left Tie
+HairBackHairBack80RightBraid,Right Braid
+HairBackHairBack80RightString,Right Tie
+HairBackHairBack81Main,Main
+HairBackHairBack81Tone,Tone
+HairBackHairBack82AFront,Front
+HairBackHairBack82ABack,Back
+HairBackHairBack83LeftFront,Left Main
+HairBackHairBack83LeftClip,Left Clip
+HairBackHairBack83RightFront,Right Main
+HairBackHairBack83RightClip,Right Clip
+HairBackHairBack83LeftFrontStreak,Left Streak
+HairBackHairBack83RightFrontStreak,Right Streak
+HairBackHairBack84Left,Left
+HairBackHairBack84Right,Right
+HairBackHairBack84LeftStreak,Left Streak
+HairBackHairBack84RightStreak,Right Streak
 HairFrontHairFront22Base, Base
 HairFrontHairFront22bBase, Base
 HairFrontHairFront22bFluff, Fluff
@@ -625,6 +645,19 @@ HairFrontHairFront65Full,Full
 HairFrontHairFront65Highlights,Highlights
 HairFrontHairFront65Shadows,Shadows
 HairFrontHairFront65Outline,Outline
+HairFrontHairFront67main,Main
+HairFrontHairFront67streak,Streak
+HairFrontHairFront68Main,Main
+HairFrontHairFront68Streak,Streak
+HairFrontHairFront69Main,Main
+HairFrontHairFront69Streak,Streak
+HairFrontHairFront70Main,Main
+HairFrontHairFront70Tone,Tone
+HairFrontHairFront71Main,Main
+HairFrontHairFront73Main,Main
+HairFrontHairFront73Tone,Tone
+HairFrontHairFront74Main,Main
+HairFrontHairFront74Streak,Streak
 HatAnimeGirlTiaraMain,Tiara
 HatAnimeGirlTiaraDetail,Detail
 HatAnimeGirlTiaraJewel,Jewel