.eslintrc.cjs

@@ -24,6 +24,7 @@ module.exports = {
 		Template: "readonly",
 		UI: "readonly",
 		UIBar: "readonly",
+		PRNGWrapper: "readonly",
 		idb: "readonly",
 		wikifier: "readonly",
 		// SugarCube functions
@@ -101,6 +102,7 @@ module.exports = {
 		DoLCompressorDictionaries: "readonly",
 		DoLSave: "readonly",
 		// DoL functions
+		tendingDay: "readonly",
 		ampm: "readonly",
 		assignDefaults: "readonly",
 		calculatePenisBulge: "readonly",
@@ -246,6 +248,9 @@ module.exports = {
 		getClothingCost: "readonly",
 		isLoveInterest: "readonly",
 		nullable: "readonly",
+		combat: "readonly",
+		wearingCondom: "readonly",
+		npcHasStrapon: "readonly",
 	},
 
 	ignorePatterns: [
@@ -258,6 +263,7 @@ module.exports = {
 		"devTools",
 		"dist",
 		"game/03-JavaScript/external",
+		"game/03-JavaScript/00-libs/renderer.js",
 	],
 
 	parserOptions: {
@@ -309,7 +315,20 @@ module.exports = {
 		"jsdoc/no-undefined-types": [
 			1,
 			{
-				definedTypes: ["EventNpc"],
+				definedTypes: [
+					"EventNpc",
+					"ClothesItem",
+					"Penetrator",
+					"TentacleState",
+					"CompositeLayerParams",
+					"CompositeLayerSpec",
+					"CanvasModelOptions",
+					"CanvasModelLayer",
+					"AnimatingCanvas",
+					"Options",
+					"Npc",
+					"NpcOptions",
+				],
 			},
 		],
 

.gitattributes

@@ -5,6 +5,8 @@ devTools/androidsdk/image text eol=lf
 # enforce proper line endings on commit
 *.sh	text eol=lf
 *.js	text eol=lf
+*.cjs	text eol=lf
+*.ts	text eol=lf
 *.css	text eol=lf
 *.twee	text eol=lf
 *.py	text eol=lf

DolSettingsExport.json

-//Variables that are missing, not expected or invalid will be ignored
-//"starting" values will only import when on the start screen
-DolSettingsExport = {
-	"starting":{
-		"player":{
-			"gender":"m",
-			"gender_body":"f",
-			"ballsExist":true,
-			"freckles":false,
+{
+	"starting": {
+		"player": {
+			"gender": "m",
+			"gender_body": "f",
+			"ballsExist": true,
+			"freckles": false,
 			"skin": {
 				"color": "light"
 			}
 		},
-		"bodysize":2,
-		"penissize":0,
-		"breastsize":0,
-		"bottomsize":0,
-		"breastsensitivity":3,
-		"genitalsensitivity":3,
-		"eyeselect":"purple",
-		"hairselect":"red",
-		"hairlength":200,
-		"awareselect":"innocent",
-		"background":"waif",
-		"gamemode":"normal"
+		"bodysize": 2,
+		"penissize": 0,
+		"breastsize": 0,
+		"bottomsize": 0,
+		"breastsensitivity": 3,
+		"genitalsensitivity": 3,
+		"eyeselect": "purple",
+		"hairselect": "red",
+		"hairlength": 200,
+		"awareselect": "innocent",
+		"background": "waif",
+		"gamemode": "normal"
 	},
-	"general":{
-		"malechance":50,
-		"maleChanceSplit":false,
-		"maleChanceMale":50,
-		"maleChanceFemale":50,
-		"dgchance":0,
-		"cbchance":0,
-		"malevictimchance":50,
-		"npcVirginityChance":50,
-		"npcVirginityChanceAdult":10,
-		"breast_mod":0,
-		"penis_mod":0,
-		"blackchance":10,
-		"alluremod":1,
+	"general": {
+		"malechance": 50,
+		"maleChanceSplit": false,
+		"maleChanceMale": 50,
+		"maleChanceFemale": 50,
+		"dgchance": 0,
+		"cbchance": 0,
+		"malevictimchance": 50,
+		"npcVirginityChance": 50,
+		"npcVirginityChanceAdult": 10,
+		"breast_mod": 0,
+		"penis_mod": 0,
+		"blackchance": 10,
+		"alluremod": 1,
 		"clothesPrice": 1,
 		"clothesPriceUnderwear": 1,
 		"clothesPriceSchool": 1,
 		"clothesPriceLewd": 1,
 		"rentmod": 1,
-		"beastmalechance":50,
-		"beastMaleChanceSplit":false,
-		"beastMaleChanceMale":50,
-		"beastMaleChanceFemale":50,
-		"monsterchance":20,
-		"monsterhallucinations":true,
+		"beastmalechance": 50,
+		"beastMaleChanceSplit": false,
+		"beastMaleChanceMale": 50,
+		"beastMaleChanceFemale": 50,
+		"monsterchance": 20,
+		"monsterhallucinations": true,
 		"blackwolfmonster": 0,
 		"greathawkmonster": 0,
-		"bestialitydisable":false,
-		"swarmdisable":false,
-		"slimedisable":false,
-		"voredisable":false,
-		"tentacledisable":false,
-		"plantdisable":false,
-		"analdisable":false,
-		"analdoubledisable":false,
-		"vaginaldoubledisable":false,
-		"transformdisable":false,
-		"hirsutedisable":true,
-		"pbdisable":true,
-		"breastfeedingdisable":false,
-		"parasitepregdisable":false,
-		"watersportsdisable":false,
-		"spiderdisable":false,
-		"bodywritingLvl":3,
-		"toydildodisable":false,
-		"toywhipdisable":false,
-		"breastsizemin":0,
-		"breastsizemax":12,
-		"bottomsizemin":0,
-		"bottomsizemax":8,
-		"penissizemax":4,
-		"penissizemin":-2,
-		"statdisable":false,
-		"cheatdisabletoggle":true,
-		"confirmSave":false,
-		"confirmLoad":false,
-		"confirmDelete":false,
-		"reducedLineHeight":false,
-		"multipleWardrobes":"isolated",
-		"outfitEditorPerPage":10,
-		"options":{
-			"debugdisable":true,
-			"neverNudeMenus":false,
-			"showCaptionText":true,
-			"clothingCaption":true,
-			"sidebarStats":"disabled",
-			"sidebarTime":"disabled",
-			"combatControls":"radio",
-			"mapMovement":true,
-			"mapTop":false,
-			"mapMarkers":false,
-			"images":1,
-			"combatImages":1,
+		"bestialitydisable": false,
+		"swarmdisable": false,
+		"slimedisable": false,
+		"voredisable": false,
+		"tentacledisable": false,
+		"plantdisable": false,
+		"analdisable": false,
+		"analdoubledisable": false,
+		"vaginaldoubledisable": false,
+		"transformdisable": false,
+		"hirsutedisable": true,
+		"pbdisable": true,
+		"breastfeedingdisable": false,
+		"parasitepregdisable": false,
+		"watersportsdisable": false,
+		"spiderdisable": false,
+		"bodywritingLvl": 3,
+		"toydildodisable": false,
+		"toywhipdisable": false,
+		"breastsizemin": 0,
+		"breastsizemax": 12,
+		"bottomsizemin": 0,
+		"bottomsizemax": 8,
+		"penissizemax": 4,
+		"penissizemin": -2,
+		"statdisable": false,
+		"cheatdisabletoggle": true,
+		"confirmSave": false,
+		"confirmLoad": false,
+		"confirmDelete": false,
+		"reducedLineHeight": false,
+		"multipleWardrobes": "isolated",
+		"outfitEditorPerPage": 10,
+		"options": {
+			"debugdisable": true,
+			"neverNudeMenus": false,
+			"showCaptionText": true,
+			"clothingCaption": true,
+			"sidebarStats": "disabled",
+			"sidebarTime": "disabled",
+			"combatControls": "radio",
+			"mapMovement": true,
+			"mapTop": false,
+			"mapMarkers": false,
+			"images": 1,
+			"combatImages": 1,
 			"bodywritingImages": true,
-			"silhouetteEnabled":true,
+			"silhouetteEnabled": true,
 			"tanImgEnabled": true,
 			"sidebarAnimations": true,
 			"blinkingEnabled": true,
@@ -114,66 +112,65 @@ DolSettingsExport = {
 			"maxStates": 1,
 			"newWardrobeStyle": true,
 			"useNarrowMarket": false,
-			"skipStatisticsConfirmation":false,
+			"skipStatisticsConfirmation": false,
 			"numberify_enabled": 1,
-			"timestyle":"military",
-			"tipdisable":false,
-			"pepperSprayDisplay":"sprays",
-			"condomsDisplay":"standard",
+			"timestyle": "military",
+			"tipdisable": false,
+			"pepperSprayDisplay": "sprays",
+			"condomsDisplay": "standard",
 			"traitOverlayFormat": "table",
-			"font":"",
-			"passageFontSize":0,
-			"sidebarFontSize":0,
-			"overlayFontSize":0,
-			"passageLineHeight":0,
-			"sidebarLineHeight":0,
-			"overlayLineHeight":0,
+			"font": "",
+			"passageFontSize": 0,
+			"sidebarFontSize": 0,
+			"overlayFontSize": 0,
+			"passageLineHeight": 0,
+			"sidebarLineHeight": 0,
+			"overlayLineHeight": 0
 		},
 		"shopDefaults": {
-			"alwaysBackToShopButton":false,
-			"color":"black",
-			"secColor":"black",
-			"colourItems":"random",
-			"compactMode":false,
-			"disableReturn":false,
-			"highContrast":false,
-			"mannequinGender":"same",
-			"mannequinGenderFromClothes":false,
-			"noHelp":false,
-			"noTraits":false,
-		},
+			"alwaysBackToShopButton": false,
+			"color": "black",
+			"secColor": "black",
+			"colourItems": "random",
+			"compactMode": false,
+			"disableReturn": false,
+			"highContrast": false,
+			"mannequinGender": "same",
+			"mannequinGenderFromClothes": false,
+			"noHelp": false,
+			"noTraits": false
+		}
 	},
-	"npc":{
-		"Avery":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Bailey":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Briar":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Charlie":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Darryl":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Doren":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Eden":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Gwylan":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Harper":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Jordan":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Kylar":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Landry":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Leighton":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Mason":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Morgan":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":5},
-		"River":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Robin":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Sam":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Sirris":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Whitney":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Winter":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Black Wolf":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Niki":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Quinn":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Remy":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Alex":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Great Hawk":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Wren":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Sydney":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
-		"Ivory Wraith":{"pronoun":"none","gender":"none", "penissize":0, "breastsize":0},
+	"npc": {
+		"Avery": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Bailey": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Briar": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Charlie": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Darryl": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Doren": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Eden": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Gwylan": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Harper": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Jordan": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Kylar": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Landry": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Leighton": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Mason": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Morgan": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 5 },
+		"River": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Robin": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Sam": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Sirris": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Whitney": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Winter": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Black Wolf": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Niki": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Quinn": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Remy": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Alex": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Great Hawk": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Wren": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Sydney": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 },
+		"Ivory Wraith": { "pronoun": "none", "gender": "none", "penissize": 0, "breastsize": 0 }
 	}
 }
-

deprecated.twee-config.yml

@@ -114,7 +114,7 @@ sugarcube-2:
     computericon: # Deprecated 0.4.3+
       deprecated: true
       deprecatedSuggestions:
-        - <<schoolicon "computer">>
+        - <<techicon "computer">>
     condommachineicon: # Deprecated 0.4.3+
       deprecated: true
       deprecatedSuggestions:
@@ -217,6 +217,10 @@ sugarcube-2:
       deprecated: true
       deprecatedSuggestions:
         - <<generatey6>>
+    gift_recipients_check:
+      deprecated: true
+      deprecatedSuggestions:
+        - canGiftFood()
     hairchairicon: # Deprecated 0.4.3+
       deprecated: true
       deprecatedSuggestions:
@@ -269,6 +273,10 @@ sugarcube-2:
       deprecated: true
       deprecatedSuggestions:
         - <<schoolicon "library">>
+    lockpickicon: # Deprecated 0.5.2.8+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<lockicon "pick">>
     lowerbodyparts: # Deprecated Old
       deprecated: true
       deprecatedSuggestions:
@@ -506,6 +514,10 @@ sugarcube-2:
       deprecated: true
       deprecatedSuggestions:
         - <<shopicon "tattoo">>
+    tending_day: # Deprecated 0.5.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - window.tendingDay
     toileticon: # Deprecated 0.4.3+
       deprecated: true
       deprecatedSuggestions:

devTools/apkbuilder/build_app_debug.bat

 @echo off
-SET "PATH=%PATH%;%CD%\androidsdk\commandline-tools\latest\bin;%CD%\androidsdk\gradle\bin"
+SET "PATH=%CD%\androidsdk\commandline-tools\latest\bin;%CD%\androidsdk\gradle\bin;%PATH%"
 SET "ANDROID_HOME=%CD%\androidsdk"
 SET "ANDROID_SDK_ROOT=%ANDROID_HOME%"
 

devTools/apkbuilder/build_app_release.bat

 @echo off
-SET "PATH=%PATH%;%CD%\androidsdk\commandline-tools\latest\bin;%CD%\androidsdk\gradle\bin"
+SET "PATH=%CD%\androidsdk\commandline-tools\latest\bin;%CD%\androidsdk\gradle\bin;%PATH%"
 SET "ANDROID_HOME=%CD%\androidsdk"
 SET "ANDROID_SDK_ROOT=%ANDROID_HOME%"
 

devTools/apkbuilder/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.vrelnir.dol" id="dol" version="0.5.2.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.vrelnir.dol" id="dol" version="0.5.3.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name short="DoL">Degrees of Lewdity</name>
     <description>Degrees of Lewdity</description>
     <author email="9096-Vrelnir@users.noreply.gitgud.io" href="https://gitgud.io/Vrelnir/degrees-of-lewdity">
         Vrelnir
     </author>
     <content src="index.html" />
+    <allow-intent href="https:*" />
     <platform name="android">
         <hook src="scripts/prevent_unnecessary_deletes.js" type="before_prepare" />
         <hook src="scripts/prepare_files.js" type="before_compile" />
@@ -14,6 +15,7 @@
         <preference name="AndroidWindowSplashScreenBackground" value="#111111" />
         <preference name="AndroidWindowSplashScreenIconBackgroundColor" value="#111111" />
         <preference name="SplashScreenDelay" value="0" />
+        <preference name="loadUrlTimeoutValue" value="120000" />
         <icon comment="36x36 px" density="ldpi" src="res/icon-ldpi.png" />
         <icon comment="48x48 px" density="mdpi" src="res/icon-mdpi.png" />
         <icon comment="72x72 px" density="hdpi" src="res/icon-hdpi.png" />

devTools/canvasmodel/model.d.ts

@@ -102,11 +102,17 @@ declare interface CompositeLayerParams {
 	 */
 	dx?: number;
 	dy?: number;
+	/**
+	 * Subsprite position on target canvas
+	 */
+	frameDx?: number;
+	frameDy?: number;
 	/**
 	 * Animation name
 	 */
 	animation?: string;
 	scale?: boolean;
+	worn?: object;
 }
 declare interface CompositeLayerSpec extends CompositeLayerParams {
 	name?: string;
@@ -137,7 +143,9 @@ declare interface KeyframeSpec {
 }
 
 declare type AnimationSpec = KeyframeAnimationSpec | SimpleAnimationSpec;
+
 declare interface KeyframeAnimationSpec {
+	frameCount: number;
 	keyframes: KeyframeSpec[];
 }
 declare interface SimpleAnimationSpec {
@@ -149,9 +157,19 @@ declare interface SimpleAnimationSpec {
 }
 
 declare interface MaskObject {
-	path?: string;
+	path: string;
 	offsetX?: number;
 	offsetY?: number;
+	convert?: boolean;
+}
+
+declare interface Offset {
+	x: number;
+	y: number;
+}
+
+declare interface MaskSpec {
+	convert: boolean;
 }
 
 declare interface CompositeLayer extends CompositeLayerSpec {
@@ -167,11 +185,15 @@ declare interface CompositeLayer extends CompositeLayerSpec {
 	/**
 	 * Loaded/cached mask image
 	 */
-	mask?: CanvasImageSource | MaskObject | (CanvasImageSource | MaskObject)[];
+	mask?: CanvasImageSource | (CanvasImageSource)[];
+	/**
+	 * Offset of mask image
+	 */
+	maskOffsets?: Offset[];
 	/**
 	 * Offset of mask image
 	 */
-	maskOffsets?: MaskObject;
+	maskOptions?: MaskSpec;
 	/**
 	 * Value of `masksrc` corresponding to current `mask` (if masksrc changes mask will be reloaded)
 	 */

devTools/canvasmodel/package-lock.json

+{
+  "name": "model",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "model",
+      "version": "0.1.0",
+      "devDependencies": {
+        "@types/tinycolor2": "^1.4.2",
+        "typescript": "^5.0.2"
+      }
+    },
+    "node_modules/@types/tinycolor2": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.3.tgz",
+      "integrity": "sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==",
+      "dev": true
+    },
+    "node_modules/typescript": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz",
+      "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
+    }
+  }
+}

devTools/canvasmodel/renderer.d.ts

+/// <reference path="model.d.ts" />
+/// <reference types="tinycolor2" />
 declare namespace Renderer {
+    export function isMaskObject(mask: string | HTMLCanvasElement | CanvasImageSource | MaskObject | undefined | null): mask is MaskObject;
+    export function isMaskOffsetObject(mask: string | HTMLCanvasElement | CanvasImageSource | MaskObject | undefined | null): mask is MaskObject;
+    export function isMaskConvertObject(mask: string | HTMLCanvasElement | CanvasImageSource | MaskObject | undefined | null): mask is MaskObject;
     export interface LayerImageLoader {
         loadImage(src: string | HTMLCanvasElement, layer: CompositeLayer, successCallback: (src: string | HTMLCanvasElement, layer: CompositeLayer, image: HTMLCanvasElement) => any, errorCallback: (src: string | HTMLCanvasElement, layer: CompositeLayer, error: any) => any): any;
     }
@@ -50,7 +55,7 @@ declare namespace Renderer {
     /**
      * Creates a cutout of color in shape of sourceImage
      */
-    export function cutout(sourceImage: CanvasImageSource, color: string, canvas?: CanvasRenderingContext2D): CanvasRenderingContext2D;
+    export function cutout(sourceImage: CanvasImageSource, color: string | CanvasGradient | CanvasPattern, canvas?: CanvasRenderingContext2D): CanvasRenderingContext2D;
     /**
      * Cuts out from base a shape in form of stencil.
      * Modifies and returns base.
@@ -59,7 +64,7 @@ declare namespace Renderer {
     /**
      * Paints sourceImage over cutout of it filled with color.
      */
-    export function composeOverCutout(sourceImage: CanvasImageSource, color: string, blendMode?: GlobalCompositeOperation, canvas?: CanvasRenderingContext2D): CanvasRenderingContext2D;
+    export function composeOverCutout(sourceImage: CanvasImageSource, color: string | CanvasGradient | CanvasPattern, blendMode?: GlobalCompositeOperation, canvas?: CanvasRenderingContext2D): CanvasRenderingContext2D;
     /**
      * Repeatedly fill all sub-frames of canvas with same style.
      * (Makes sense with gradient and pattern fills, to keep consistents across all sub-frames)
@@ -110,7 +115,7 @@ declare namespace Renderer {
      * In both cases, brightness is added, contrast is multiplied.
      * Returns target
      */
-    export function mergeLayerData(target: CompositeLayerSpec, source: CompositeLayerParams, overwrite?: boolean): CompositeLayerSpec;
+    export function mergeLayerData(target: Partial<CompositeLayerSpec>, source: CompositeLayerParams, overwrite?: boolean): Partial<CompositeLayerSpec>;
     export function encodeProcessing(spec: CompositeLayerSpec): string;
     export function composeLayersAgain(): void;
     export function desaturateImage(image: CanvasImageSource, resultCanvas?: CanvasRenderingContext2D, doCutout?: boolean): HTMLCanvasElement;

devTools/canvasmodel/yarn.lock

@@ -4,10 +4,10 @@
 
 "@types/tinycolor2@^1.4.2":
   version "1.4.3"
-  resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.3.tgz#ed4a0901f954b126e6a914b4839c77462d56e706"
+  resolved "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.3.tgz"
   integrity sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==
 
 typescript@^5.0.2:
   version "5.0.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.2.tgz#891e1a90c5189d8506af64b9ef929fca99ba1ee5"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz"
   integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==

devTools/typings.d.ts

-/*
- * This is a TypeScript typings file with definitions an documentation of in-game structures.
- *
- * While documenting everything  here is optional, the definitions might be picked by IDE,
- * and, should TypeScript rewrite become a thing in future, would work as a static type check.
- */
-
-/* Declare commonly used aliases or functions */
-declare var V: any;
-declare var T: any;
-declare var random: any;
-
-// Add our extensions
-interface ObjectConstructor {
-    hasOwn(object: any, property: any): boolean;
-    deepMerge(...objects): object;
-    find(objects: any): object;
-}
-interface NumberConstructor {
-    shuffle();
-	select(index: number): any;
-	except(): any;
-	formatList(options: any): any;
-}
-interface ArrayConstructor {
-    between(min: number, max: number): boolean;
-}
-
-declare interface ClothesItem {
-	index: number;
-	name: string;
-	name_cap: string;
-	name_simple: string;
-	/**
-	 * Folder name
-	 */
-	variable: string;
-	integrity: number;
-	integrity_max: number;
-	fabric_strength: number;
-	reveal: number;
-	bustresize: number;
-	one_piece: number;
-	strap: number;
-	open: number;
-	word: "a";
-	state: string;
-	state_base: string;
-	state_top: string;
-	state_top_base: string;
-	plural: number;
-	/**
-	 * key in setup.colours.prefilters identifying preprocessing required for canvas renderer.
-	 * default is "clothes"
-	 */
-	prefilter?: string;
-	colour: string|0;
-	colour_options: string[];
-	colour_sidebar: 0|1;
-	exposed: number;
-	exposed_base: number;
-	vagina_exposed: number;
-	vagina_exposed_base: number;
-	anus_exposed: number;
-	anus_exposed_base: number;
-	type: string[];
-	set: string;
-	gender: string;
-	femininity: number;
-	warmth: number;
-	cost: number;
-	description: string;
-	shop: string[];
-	accessory: number;
-	accessory_colour: string|0;
-	accessory_colour_options: string[];
-	accessory_colour_sidebar: number;
-	/**
-	 * if 1, then accessory files are integrity-dependent "acc_(tattered|torn|frayed|full).png"
-	 */
-	accessory_integrity_img?: 0|1;
-	/**
-	 * if 1, then accessory files layer under breast sprites
-	 */
-	accessory_layer_under?: 0|1;
-	high_img: 0|1;
-	back_img: 0|1;
-	/**
-	 * Recolouring of back image
-	 * * "" (default) - depending on colour_sidebar
-	 * * "no" - do not recolour image
-	 * * "primary" - use primary/main colour
-	 * * "secondary" - use secondary/accessory colour
-	 */
-	back_img_colour?: ""|"no"|"primary"|"secondary";
-	/**
-	 * (For upper, over_upper, under_upper slots)
-	 * 1 if has sleeve images, named (left|right)[_cover].png".
-	 * Colouring depends on sleeve_colour property.
-	 */
-	sleeve_img: number;
-	/**
-	 * (For upper, over_upper, under_upper slots)
-	 * 1 if has sleeve accessory images, named (left|right)[_cover]_acc.png".
-	 * These images are not colored.
-	 * Requires sleeve_img: 1.
-	 */
-	sleeve_acc_img: number;
-	/**
-	 * (For upper, over_upper, under_upper slots)
-	 * Recolouring of sleeves images:
-	 * * "" (default) - depending on colour_sidebar
-	 * * "no" - do not recolour image
-	 * * "primary" - use primary/main colour
-	 * * "secondary" - use secondary/accessory colour
-	 */
-	sleeve_colour?: ""|"no"|"primary"|"secondary";
-	/**
-	 * * 1 if has breast sprites and a unique image for every breast sprite
-	 * * 0 if no breast sprites
-	 * * Key represents breast size tier 0..6.
-	 * * Value represents the image used:
-	 *     - null if no clothed breast image exists for that breast size.
-	 *     - 0..6 for clothed breast image used for that breast size.
- 	 */
-	breast_img: object|1|0;
-	cursed: number;
-	location: number;
-	iconFile: string;
-	accIcon: number;
-	outfitPrimary: object;
-	outfitSecondary: string[];
-	notuck: number;
-	/**
-	 * (For head slots)
-	 * if 1, this item has mask.png image to cut out hair & animal ears layers
-	 */
-	mask_img?: number;
-	// TODO list and document other options
-}
-
-declare namespace setup {
-	/**
-	 * Slot names
-	 */
-	export let clothes_all_slots: string[];
-	export namespace clothes {
-		export let over_upper: ClothesItem[];
-		export let over_lower: ClothesItem[];
-		export let upper: ClothesItem[];
-		export let lower: ClothesItem[];
-		export let under_upper: ClothesItem[];
-		export let under_lower: ClothesItem[];
-		export let over_head: ClothesItem[];
-		export let head: ClothesItem[];
-		export let face: ClothesItem[];
-		export let neck: ClothesItem[];
-		export let hands: ClothesItem[];
-		export let legs: ClothesItem[];
-		export let feet: ClothesItem[];
-		export let genitals: ClothesItem[];
-	}
-}

docs/canvasmodel-combat.md

+# Canvas model documentation
+
+[[_TOC_]]
+
+# Wiki
+
+A reminder for the different states clothing can be in.
+
+![exhib1](assets/exhib1.png)
+
+# Model options
+
+## Clothes object
+
+## Penetrator object
+
+# To Do
+
+## Clothes
+
+### Structure
+
+#### Lowerwear
+
+Lowerwear generally remains along the player's positional states: waist, thighs, knees, and ankles.
+Skirts are an exception to this rule. As they are tubular. And can be lifted up, beyond the head.
+
+##### Short skirts
+
+Mandatory states: waist, thighs, knees, and ankles.
+
+Optional states: chest and midriff.
+
+Missionary specifics:
+
+-   Front and back: all?
+-   Leg positioned: waist, thighs, knees, ankles.
+
+Doggy specifics:
+
+-   Front and back: all?
+
+##### Long skirts
+
+Mandatory states: waist, thighs, knees, and ankles.
+
+Optional states: chest and midriff.
+
+Missionary specifics:
+
+-   Front and back: all?
+-   Leg positioned: waist, thighs, knees, ankles.
+
+##### Trousers
+
+Mandatory states: waist, thighs, knees, and ankles.
+
+Optional states: None.
+
+Missionary specifics:
+
+-   Front and back: all?
+-   Leg positioned: waist, thighs, knees, ankles.
+
+##### Shorts
+
+Mandatory states: waist, thighs, knees, and ankles.
+
+Optional states: None.
+
+Missionary specifics:
+
+-   Front and back: all?
+-   Leg positioned: waist, thighs, knees, ankles.
+
+### Issues
+
+-   [ ] Shirt sprites have sleeves embedded into them, these should be moved to the sleeves of the sprites.
+
+## Penetrators
+
+Penetrator(s) need to be redesigned to rest upon the face of the PC:
+
+-   img\sex\missionary\penetrators\human\mouth-entrance.png
+-   img\sex\missionary\penetrators\human\mouth-imminent.png
+
+Penetrator(s) need to be improved so the base of the penetrator does not seem too intrusive for when other NPC shadows are over it.
+
+-   img\sex\missionary\penetrators\human\mouth-penetrated.png

events.twee-config.yml

@@ -12,6 +12,9 @@ sugarcube-2:
       parameters:
         - '"breakfast"|"chores"|"cuddle"|"cuddleDesk"|"rest"'
       tags: ["links", "text"]
+    avery_date_options:
+      name: avery_date_options
+      tags: ["links", "text"]
     balloonRobinIntro:
       name: balloonRobinIntro
     beach_strip_events:
@@ -54,15 +57,31 @@ sugarcube-2:
     events_pirate_deck:
       name: events_pirate_deck
       tags: ["multiEvents"]
+    eventsbeachphallus:
+      description: |-
+        Generate NPC(s) to approach for the school science phallus measuring project
+      tags: ["text", "multiEvents", "links"]
     eventsenglishsleep:
       name: eventsenglishsleep
       tags: ["multiEvents"]
     eventshistorysleep:
       name: eventshistorysleep
       tags: ["multiEvents"]
+    eventshousekeeping:
+      name: eventshousekeeping
+      tags: ["multiEvents"]
+    eventshousekeepingsafe:
+      name: eventshousekeepingsafe
+      tags: ["multiEvents"]
+    eventshousekeepingsleep:
+      name: eventshousekeepingsleep
+      tags: ["multiEvents"]
     eventsmathssleep:
       name: eventsmathssleep
       tags: ["multiEvents"]
+    eventsschoolcourtyard:
+      name: eventsschoolcourtyard
+      tags: ["multiEvents"]
     eventssciencesleep:
       name: eventssciencesleep
       tags: ["multiEvents"]
@@ -227,6 +246,17 @@ sugarcube-2:
       tags: ["text"]
     mushroompick:
       name: mushroompick
+    schoolChangingRoomEmpty:
+      description: |-
+        Prints empty school changing room passage if actually empty
+      tags: ["text", "links"]
+    schoolnightpoolpartyend:
+      name: schoolnightpoolpartyend
+      tags: ["text", "links"]
+    schoolPoolEntranceExposed:
+      description: |-
+        Prints actions for entering pool while exposed
+      tags: ["text", "links"]
     scienceCondomIntro:
       name: scienceCondomIntro
     scienceProject:
@@ -249,6 +279,10 @@ sugarcube-2:
       description: |-
         Draws and prints the start of a Whitney bully event
       tags: ["multiEvents", "text", "links"]
+    WhitneyRulePunishment:
+      description: |-
+        Prints a punishment event from Whitney
+      tags: ["multiEvents", "text", "links"]
     whitneyShoppingCentre:
       description: |-
         Prints interrupt passage of Whitney taking pc to the shopping centre

game/00-framework-tools/perflog.js

+/* eslint-disable no-undef */
 // Time in milliseconds, float with microsecond precision if available.
 const millitime =
 	typeof performance === "object" && typeof performance.now === "function"

game/01-config/start.twee

@@ -17,7 +17,7 @@ Degrees of Lewdity
 	<<banner>>
 <</if>>
 
-This work of fiction contains content of a sexual nature and is inappropriate for minors. All characters <span class="camouflage text"><a onclick="V.debug = 1, V.options.debugdisable = 'f', V.options.historyControls = true">de</a></span>picted are at least 18 years of age. Everything is consensual role play, and any animals are actually people in costumes.
+This work of fiction contains content of a sexual nature and is inappropriate for minors. All characters <span class="camouflage text" onclick="V.debug = 1, V.options.debugdisable = 'f', V.options.historyControls = true">de</span>picted are at least 18 years of age. Everything is consensual role play, and any animals are actually people in costumes.
 <br><br>
 
 <div class="small-description">
@@ -104,7 +104,7 @@ If you want to avoid trouble, dress modestly and stick to safe, well-lit areas.
 	<<link [[Winter Start|Orphanage Intro]]>><<set Time.startDate to new DateTime(2022, 12, 4, 7)>><</link>> (Begins the game at the start of winter. For testing.)
 	<br>
 
-	<<link [[Christmas Start|Orphanage Intro]]>><<npc Kylar>><<person1>><<endevent>><<set C.npc.Kylar.state to "active">><<set Time.startDate to new DateTime(2022, 12, 23, 7)>><<set $money += 50000>><</link>> (Begins the game two days before Christmas. For testing.)
+	<<link [[Christmas Start|Orphanage Intro]]>><<npc Kylar>><<person1>><<endevent>><<set C.npc.Kylar.state to "active">><<set Time.startDate to new DateTime(2022, 12, 23, 7)>><<money 50000 "debug">><</link>> (Begins the game two days before Christmas. For testing.)
 	<br>
 
 	<<link [[Valentine's Day Start|Orphanage Intro]]>><<set Time.startDate to new DateTime(2022, 2, 12, 7)>><</link>> (Begins the game 2 days before Valentine's Day. For testing.)