First beta fixes

BondageClub/Assets/Female3DCG/Female3DCG.js

@@ -2839,6 +2839,7 @@ var AssetFemale3DCG = [
 				Expose: ["ItemNipples", "ItemBreast", "ItemNipplesPiercings"],
 				HasType: false,
 				Extended: true,
+				DynamicAfterDraw: true,
 				PoseMapping: {
 					...AssetPoseMapping.Suit,
 					TapedHands: PoseType.DEFAULT,
@@ -2863,6 +2864,7 @@ var AssetFemale3DCG = [
 					},
 					{ Name: "PP", AllowTypes: ["Prisoner"] },
 					{ Name: "Zip" },
+					{ Name: "Text", HasImage: false },
 					{
 						Name: "Shine",
 						CopyLayerColor: "Zip",

BondageClub/Assets/Female3DCG/Female3DCGExtended.js

@@ -12583,19 +12583,29 @@ var AssetFemale3DCGExtended = {
 		}, // Catsuit
 		LatexCatsuit: {
 			Archetype: ExtendedArchetype.TYPED,
+			ChatTags: [
+				CommonChatTags.SOURCE_CHAR,
+				CommonChatTags.DEST_CHAR,
+				CommonChatTags.DEST_CHAR_NAME,
+				CommonChatTags.ASSET_NAME,
+			],
 			Options: [
 				{
-					Name: "Standart",
+					Name: "Standard",
 				},
 				{
 					Name: "Prisoner",
 				},
 			],
-			DialogPrefix: {
-				Header: "SelectSuitType",
-				Option: "SuitType",
-			},
 			DrawImages: false,
+			BaselineProperty: { Text: "PRISONER", Text2: "#0000" },
+			ChatSetting: TypedItemChatSetting.FROM_TO,
+			ScriptHooks: {
+				Load: InventorySuitLatexCatsuitLoadHook,
+				Draw: InventorySuitLatexCatsuitDrawHook,
+				Exit: InventorySuitLatexCatsuitExitHook,
+				PublishAction: InventorySuitLatexCatsuitPublishActionHook,
+			},
 		}, // LatexCatsuit
 		SeamlessCatsuit: {
 			Archetype: ExtendedArchetype.TYPED,
@@ -12672,15 +12682,15 @@ var AssetFemale3DCGExtended = {
 			Archetype: ExtendedArchetype.TYPED,
 			Options: [
 				{
-					Name: "Standart",
+					Name: "Standard",
 				},
 				{
 					Name: "Prisoner",
 				},
 			],
 			DialogPrefix: {
-				Header: "SelectSuitType",
-				Option: "SuitType",
+				Header: "SuitLatexCatsuitSelect",
+				Option: "SuitLatexCatsuit",
 			},
 			DrawImages: false,
 		}, // LatexCatsuit

BondageClub/Assets/Female3DCG/LayerNames.csv

@@ -107,6 +107,7 @@ SuitCatsuitOpaqueGloves,Gloves
 SuitLatexCatsuitBase,Suit
 SuitLatexCatsuitZip,Shine
 SuitLatexCatsuitPP,Label
+SuitLatexCatsuitText,Text
 SuitLowerLatexCatsuitBase,Suit
 SuitLowerLatexCatsuitZip,Shine
 SuitLowerLatexCatsuitPP,Label

BondageClub/CSS/Styles.css

@@ -465,3 +465,7 @@ input[type=range][data-thumb=rope]::-moz-range-thumb {
 	font-family: 'Caveat-Bold';
 	src: url('../Fonts/Caveat/Caveat-Bold.ttf');
 }
+@font-face {
+	font-family: 'Libre Barcode 39';
+	src: url('../Fonts/Libre_Barcode_39/LibreBarcode39-Regular.ttf');
+  }

BondageClub/Fonts/Libre_Barcode_39/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2017-2019 The Libre Barcode Project Authors (https://github.com/graphicore/librebarcode)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

BondageClub/Screens/Character/Player/Dialog_Player.csv

@@ -2889,9 +2889,12 @@ SelectSuitGloves,,,Select the suit's gloves,,
 SuitGloveTypeNoGloves,,,No Gloves,,
 SuitGloveTypeOpaqueGloves,,,Opaque Gloves,,
 SuitGloveTypeTransparentGloves,,,See-through Gloves,,
-SelectSuitType,,,Select the suit's type,,
-SuitTypeStandart,,,Standart suit,,
-SuitTypePrisoner,,,Prisoner suit,,
+SuitLatexCatsuitSelect,,,Select the suit's type,,
+SuitLatexCatsuitStandard,,,Standard suit,,
+SuitLatexCatsuitPrisoner,,,Prisoner suit,,
+SuitLatexCatsuitTitleLabel,,,Label:,,
+SuitLatexCatsuitBarcodeLabel,,,Barcode:,,
+SuitLatexCatsuitTextLabel,,,Text:,,
 VibeModeDecreaseTo-1,,,DestinationCharacterName AssetName stops vibrating.,,
 VibeModeDecreaseTo0,,,DestinationCharacterName AssetName slows down into a light tease.,,
 VibeModeDecreaseTo1,,,DestinationCharacterName AssetName returns to a moderate pace.,,

BondageClub/Screens/Inventory/Suit/LatexCatsuit/LatexCatsuit.js

@@ -0,0 +1,112 @@
+"use strict";
+
+
+/** @type {ExtendedItemScriptHookCallbacks.Load<TypedItemData>} */
+function InventorySuitLatexCatsuitLoadHook(Data, OriginalFunction) {
+	const textData = ExtendedItemGetData(DialogFocusItem.Asset, ExtendedArchetype.TEXT);
+	if (textData === null) {
+		return;
+	}
+
+	OriginalFunction();
+	// Load that font manually
+	DynamicDrawLoadFont("'Libre Barcode 39'");
+	TextItem.Load(textData);
+}
+
+/** @type {ExtendedItemScriptHookCallbacks.Draw<TypedItemData>} */
+function InventorySuitLatexCatsuitDrawHook(Data, OriginalFunction) {
+	const textData = ExtendedItemGetData(DialogFocusItem.Asset, ExtendedArchetype.TEXT);
+	if (textData === null) {
+		return;
+	}
+
+	OriginalFunction();
+	TextItem.Draw(textData);
+
+	MainCanvas.textAlign = "right";
+	const Prefix = Data.dialogPrefix.option;
+	DrawTextFit(DialogFindPlayer(`${Prefix}TitleLabel`), 1290, 760, 400, "#fff", "#000");
+	DrawTextFit(DialogFindPlayer(`${Prefix}BarcodeLabel`), 1290, 810, 400, "#fff", "#000");
+	DrawTextFit(DialogFindPlayer(`${Prefix}TextLabel`), 1290, 860, 400, "#fff", "#000");
+	MainCanvas.textAlign = "center";
+}
+
+/** @type {ExtendedItemScriptHookCallbacks.PublishAction<TypedItemData, any>} */
+function InventorySuitLatexCatsuitPublishActionHook(data, originalFunction, C, item, newOption, previousOption) {
+	switch (newOption.OptionType) {
+		case "TextItemOption": {
+			const textData = ExtendedItemGetData(item.Asset, ExtendedArchetype.TEXT);
+			if (textData === null) {
+				return;
+			}
+			TextItem.PublishAction(textData, C, item, newOption, previousOption);
+			return;
+		}
+
+		case "TypedItemOption":
+			originalFunction(C, item, newOption, previousOption);
+			return;
+	}
+}
+
+/** @type {ExtendedItemScriptHookCallbacks.Exit<TypedItemData>} */
+function InventorySuitLatexCatsuitExitHook(Data, OriginalFunction) {
+	const textData = ExtendedItemGetData(DialogFocusItem.Asset, ExtendedArchetype.TEXT);
+	if (textData !== null) {
+		TextItem.Exit(textData);
+	}
+}
+
+/** @type {ExtendedItemCallbacks.AfterDraw} */
+function AssetsSuitLatexCatsuitAfterDraw(
+	{ C, A, CA, X, Y, L, drawCanvas, drawCanvasBlink, AlphaMasks, Color },
+) {
+	const data = ExtendedItemGetData(A, ExtendedArchetype.TEXT);
+	if (data != null && L === "_Text") {
+		const width = 140;
+		const height = 60;
+		const flatCanvas = AnimationGenerateTempCanvas(C, A, width, height);
+		const flatCtx = flatCanvas.getContext("2d");
+
+		TextItem.Init(data, C, CA, false);
+
+		if (CA.Property.Text) {
+			DynamicDrawText(CA.Property.Text, flatCtx, width / 2, height * 2 / 3.3 , {
+				fontSize: 18,
+				fontFamily: data.font,
+				color: Color,
+				width,
+				radius: 170
+			});
+		}
+
+		if (CA.Property.Text2) {
+			// Strip out any weird characters that might peek through
+			const barcodeText = CA.Property.Text2.split("").filter(char => char.match(/[a-zA-Z0-9]/)).join("");
+			DynamicDrawText(barcodeText, flatCtx, width / 2, height * 15 / 14, {
+				fontSize: 20,
+				fontFamily: "'Libre Barcode 39'",
+				color: Color,
+				width,
+			});
+		}
+
+		if (CA.Property.Text3) {
+			DynamicDrawTextArc(CA.Property.Text3, flatCtx, width / 2, height * 5 / 6.2, {
+				fontSize: 14,
+				fontFamily: data.font,
+				color: Color,
+				width,
+			});
+		}
+
+		const shearedCanvas = AnimationGenerateTempCanvas(C, A, width, height);
+		DrawImageTrapezify(flatCanvas, shearedCanvas, 0.4);
+
+		const drawX = X + (500 - width) / 2;
+		const drawY = Y + 226;
+		drawCanvas(shearedCanvas, drawX, drawY, AlphaMasks);
+		drawCanvasBlink(shearedCanvas, drawX, drawY, AlphaMasks);
+	}
+}

BondageClub/Scripts/ExtendedItem.js

@@ -1107,6 +1107,25 @@ function ExtendedItemManualRegister() {
 				},
 			},
 		},
+		{
+			group: "Suit",
+			name: "LatexCatsuit",
+			config: {
+				Archetype: ExtendedArchetype.TEXT,
+				MaxLength: { Text: 14, Text2: 14, Text3: 14, },
+				Font: "'Saira Stencil One', 'Arial', sans-serif",
+				DrawData: {
+					elementData: [
+						{ position: [1505, 750] },
+						{ position: [1505, 800] },
+						{ position: [1505, 850] },
+					],
+				},
+				DialogPrefix: {
+					Header: "SuitLatexCatsuitSelect",
+				},
+			},
+		},
 	];
 
 	for (const { group, name, config } of items) {

BondageClub/index.html

@@ -108,6 +108,7 @@
 <script src="Screens/Inventory/ItemDevices/KabeshiriWall/KabeshiriWall.js"></script>
 <script src="Screens/Inventory/ItemDevices/FuckMachine/FuckMachine.js"></script>
 <script src="Screens/Inventory/ItemBreast/ForbiddenChastityBra/ForbiddenChastityBra.js"></script>
+<script src="Screens/Inventory/Suit/LatexCatsuit/LatexCatsuit.js"></script>
 <script src="Assets/Female3DCG/Female3DCGExtended.js"></script>
 <script src="Screens/Character/Login/Login.js"></script>
 <script src="Screens/Character/Appearance/Appearance.js"></script>