.eslintrc.cjs

@@ -24,6 +24,9 @@ module.exports = {
 		Template: "readonly",
 		UI: "readonly",
 		UIBar: "readonly",
+		PRNGWrapper: "readonly",
+		idb: "readonly",
+		wikifier: "readonly",
 		// SugarCube functions
 		clone: "readonly",
 		either: "readonly",
@@ -47,12 +50,13 @@ module.exports = {
 		visited: "readonly",
 		visitedTags: "readonly",
 		throwError: "writeable",
-		// Dol shortcuts
+		// DoL shortcuts
 		C: "readonly",
 		DeserializeGame: "readonly",
 		globals: "readonly",
 		T: "readonly",
 		V: "readonly",
+		statChange: "readonly",
 		// DoL main namespaces
 		DOL: "readonly",
 		defineGlobalNamespaces: "readonly",
@@ -64,75 +68,169 @@ module.exports = {
 		// DoL other namespaces/objects
 		Constants: "readonly",
 		ConstantsLoader: "readonly",
+		Cooker: "readonly",
 		currentlyLoadingMap: "readonly",
-		DoLHouse: "readonly",
+		ColourUtils: "readonly",
+		DateTime: "readonly",
 		DolSettingsExport: "readonly",
 		Dynamic: "readonly",
+		EventSystem: "readonly",
+		JsonCompressor: "readonly",
+		JsonDecompressor: "readonly",
 		IronMan: "readonly",
 		Links: "readonly",
 		playerDoll: "readonly",
+		statDisplay: "readonly",
 		Renderer: "readonly",
 		SexTypes: "readonly",
 		StartConfig: "readonly",
+		Time: "readonly",
+		TimeConstants: "readonly",
 		Utils: "readonly",
 		ZIndices: "readonly",
-		Time: "readonly",
-		EventSystem: "readonly",
+		Packer: "readonly",
+		Weather: "readonly",
+		BaseCanvas: "readonly",
+		Orbital: "readonly",
+		Fadable: "readonly",
+		Skin: "readonly",
+		Sunscreen: "readonly",
+		// DoL SC2 functions
+		compressionVerifier: "readonly",
+		DefineMacro: "readonly",
+		DefineMacroS: "readonly",
+		DoLCompressorDictionaries: "readonly",
+		DoLSave: "readonly",
 		// DoL functions
+		tendingDay: "readonly",
+		ampm: "readonly",
 		assignDefaults: "readonly",
-		between: "readonly",
+		calculatePenisBulge: "readonly",
+		canBeMPregnant: "readonly",
+		closeOverlay: "readonly",
 		clothesDataTrimmer: "readonly",
 		clothesIndex: "readonly",
 		clothingData: "readonly",
 		combatListColor: "readonly",
-		DefineMacro: "readonly",
-		DefineMacroS: "readonly",
-		DoLSave: "readonly",
+		currentSkillValue: "readonly",
 		eCheckbox: "readonly",
+		earnHourlyFeats: "readonly",
 		eInput: "readonly",
 		elechild: "readonly",
 		elechildren: "readonly",
 		element: "readonly",
+		endPlayerPregnancy: "readonly",
 		ensure: "readonly",
 		ensureIsArray: "readonly",
 		eSelect: "readonly",
+		getTimeString: "readonly",
 		generateBabyName: "readonly",
+		getBirdBurnTime: "readonly",
 		getCustomClothesColourCanvasFilter: "readonly",
 		getCustomColourRGB: "readonly",
 		getCustomColourStyle: "readonly",
+		getKylarLibraryState: "readonly",
+		getPregnancyObject: "readonly",
 		getRandomIntInclusive: "readonly",
 		getRobinLocation: "readonly",
 		getSexesFromRandomGroup: "readonly",
+		getSydneyLoveNorm: "readonly",
 		getTrueWarmth: "readonly",
+		getVisibleClothesList: "readonly",
+		hairLengthStringToNumber: "readonly",
 		inDOM: "readonly",
+		integrityKeyword: "readonly",
 		ironmanAutoSave: "readonly",
+		isBloodmoon: "readonly",
+		isKylarInPlayRole: "readonly",
+		isKylarRehearsing: "readonly",
+		isPlayerNonparasitePregnancyEnding: "readonly",
+		knowsAboutAnyPregnancy: "readonly",
+		listUniqueCarriedSextoys: "readonly",
 		loadCustomColourPreset: "readonly",
+		maleChance: "readonly",
+		masturbationActions: "readonly",
+		masturbationAudience: "readonly",
+		masturbationEffects: "readonly",
+		masturbationSlimeControl: "readonly",
+		maxParasites: "readonly",
+		npcCompressor: "readonly",
+		npcDecompressor: "readonly",
 		npcEquipSet: "readonly",
 		npcMakeNaked: "readonly",
+		npcPregnancyCycle: "readonly",
+		npcPregObject: "readonly",
+		numberOfEarSlime: "readonly",
+		ordinalSuffixOf: "readonly",
 		overlayShowHide: "readonly",
+		painToTearsLvl: "readonly",
+		parasiteProgressDay: "readonly",
+		parasiteProgressTime: "readonly",
+		parentFunction: "readonly",
 		parseCSSFilter: "readonly",
 		pickRandomItemInArray: "readonly",
+		playerAwareTheyArePregnant: "readonly",
+		playerBellySize: "readonly",
+		playerBellyVisible: "readonly",
+		playerChastity: "readonly",
+		playerEndWaterProgress: "readonly",
+		playerHasButtPlug: "readonly",
 		playerHasStrapon: "readonly",
+		playerHeatMinArousal: "readonly",
+		playerIsPregnant: "readonly",
+		playerNormalPregnancyTotal: "readonly",
+		playerPregnancyProgress: "readonly",
+		playerRutMinArousal: "readonly",
+		pregnancyGenerator: "readonly",
+		pregnancyProgress: "readonly",
+		pregPrep: "readonly",
+		randomPregnancyProgress: "readonly",
 		registerGeneratedPattern: "readonly",
 		registerImagePattern: "readonly",
+		returnTimeFormat: "readonly",
 		rgbToHsv: "readonly",
+		rollKylarLibraryStalkFlag: "readonly",
 		selfOr: "readonly",
+		setKnowsAboutPregnancy: "readonly",
+		setLowerVisibility: "readonly",
 		settingsConvert: "readonly",
 		settingsObjects: "readonly",
 		shopClothCustomColorWheel: "readonly",
 		sliderPerc: "readonly",
-		stringFrom: "readonly",
+		statusCheck: "readonly",
+		tanned: "readonly",
 		updateCustomColour: "readonly",
 		updateExportDay: "readonly",
 		updateMannequin: "readonly",
 		updateSavesCount: "readonly",
 		validateValue: "readonly",
-		tanned: "readonly",
+		waterproofCheck: "readonly",
+		initializeTooltips: "readonly",
+		// DoL math functions
+		round: "readonly",
+		normalise: "readonly",
+		categorise: "readonly",
+		randomExp: "readonly",
+		expCurve: "readonly",
+		between: "readonly",
+		nCr: "readonly",
+		formatDecimals: "readonly",
+		inverseLerp: "readonly",
+		lerp: "readonly",
+		interpolate: "readonly",
+		interpolateObject: "readonly",
+		boundedRandom: "readonly",
+		calculateBinomial: "readonly",
+		weightedRandom: "readonly",
+		// DoL object functions
+		formatList: "readonly",
+		stringFrom: "readonly",
+		toTitleCase: "readonly",
+		resolveValue: "readonly",
 		// DoL classes
 		ObservableValue: "readonly",
 		CanvasModel: "readonly",
-		DollHouse: "readonly",
-		FDoll: "readonly",
+		PRNG: "readonly",
 		// Third-party
 		define: "readonly",
 		iro: "readonly",
@@ -149,7 +247,10 @@ module.exports = {
 		version: "readonly",
 		getClothingCost: "readonly",
 		isLoveInterest: "readonly",
-		skinColor: "readonly",
+		nullable: "readonly",
+		combat: "readonly",
+		wearingCondom: "readonly",
+		npcHasStrapon: "readonly",
 	},
 
 	ignorePatterns: [
@@ -162,23 +263,23 @@ module.exports = {
 		"devTools",
 		"dist",
 		"game/03-JavaScript/external",
+		"game/03-JavaScript/00-libs/renderer.js",
 	],
 
 	parserOptions: {
-		// Support back to ES2019 to cover old mobile devices with outdated WebView versions that fail on 2020 and up functions
-		// ecmaVersion: "2019", (taken care of by env es2019)
+		// Support back to ES2020 to cover old mobile devices with outdated WebView versions that fail on 2020 and up functions
 		sourceType: "module",
 	},
 
 	env: {
 		browser: true,
-		es2019: true,
+		es2021: true,
 		jquery: true,
 	},
 
-	plugins: ["es"],
+	plugins: ["es-x"],
 
-	extends: ["eslint:recommended", "plugin:jsdoc/recommended", "prettier-standard/prettier-file", "plugin:es/restrict-to-es2019"],
+	extends: ["eslint:recommended", "plugin:jsdoc/recommended", "prettier-standard/prettier-file", "plugin:es-x/restrict-to-es2021"],
 
 	settings: {
 		jsdoc: {
@@ -193,6 +294,12 @@ module.exports = {
 		// SugarCube extends native objects and we follow it
 		"no-extend-native": "off",
 
+		/* hasOwn */
+		// No need for this, since we're overriding hasOwn for older browers (01-compatibility.js)
+		// Warn for the hasOwnProperty instead
+		"es-x/no-object-hasown": "off",
+		"prefer-object-has-own": "warn",
+
 		/* eslint-plugin-jsdoc */
 
 		// Descriptions should be sentence-like not comment-like
@@ -205,11 +312,28 @@ module.exports = {
 		"jsdoc/require-returns-description": "off",
 		"jsdoc/require-returns": "off",
 
+		"jsdoc/no-undefined-types": [
+			1,
+			{
+				definedTypes: [
+					"EventNpc",
+					"ClothesItem",
+					"Penetrator",
+					"TentacleState",
+					"CompositeLayerParams",
+					"CompositeLayerSpec",
+					"CanvasModelOptions",
+					"CanvasModelLayer",
+					"AnimatingCanvas",
+					"Options",
+					"Npc",
+					"NpcOptions",
+				],
+			},
+		],
+
 		/* eslint-plugin-prettier */
 
 		"prettier/prettier": "warn",
-
-		// Rule to fix Safari/Webkit not supporting a 4+ year old function you idiots
-		"es/no-regexp-lookbehind-assertions": "error",
 	},
 };

.gitattributes

@@ -5,8 +5,10 @@ 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
 *.txt	text eol=lf
-
+*.bat	text eol=lf

.prettierrc.json

@@ -3,5 +3,7 @@
 	"useTabs": true,
 	"semi": true,
 	"endOfLine": "lf",
-	"arrowParens": "avoid"
+	"arrowParens": "avoid",
+	"trailingComma": "es5",
+	"proseWrap": "preserve"
 }

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"
+			}
 		},
-		"skinColor":{
-			"natural":"light",
-			"range":0
-		},
-		"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,
-			"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,
-			"tanningEnabled": true,
 			"sidebarAnimations": true,
 			"blinkingEnabled": true,
 			"combatAnimations": true,
@@ -115,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 }
 	}
 }
-

LICENSE

@@ -30,7 +30,7 @@ Section 2 – Scope.
         Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
         Downstream recipients.
             Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-            Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+            Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter's License You apply.
             No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
         No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
 
@@ -59,7 +59,7 @@ Your exercise of the Licensed Rights is expressly made subject to the following
     ShareAlike.
 
     In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
-        The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.
+        The Adapter's License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.
         You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
         You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
 

README.md

@@ -26,7 +26,7 @@ _Failure to do so can lead to your work being denied._
 
 ### Build Android version (.apk)
 
-See [mobile-build.md](docs\mobile-build.md)
+See [README in devTools/apkbuilder](devTools/apkbuilder/README-windows.txt)
 
 ## Development
 

compile.sh

@@ -48,6 +48,14 @@ function compile() {
 					TWEEGO_EXE="./devTools/tweego/tweego_linux86"
 				fi
 				;;
+			arm64)
+				echoMessage "arm64 arch"
+				if [ "$(uname -s)" = "Darwin" ]; then
+					TWEEGO_EXE="./devTools/tweego/tweego_m1"  #for mac m1 and m2
+				#else
+				#not linux arm
+				fi
+				;;
 			*)
 				echoError "No system tweego binary found, and no precompiled binary for your platform available."
 				echoError "Please compile tweego and put the executable in PATH."

deprecated.twee-config.yml

+aliases:
+  decoration:
+    img: &img
+      border: 1px
+      borderStyle: dashed dashed dashed
+    unused: &unused
+      border: 0px
+sugarcube-2:
+  macros:
+    abominationold: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<initWraith "abomination">>
+    abominationold2: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<initWraith "abomination">>
+    actionsanuspenisfuck: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<actionsanuspenisfucknew>>
+    actionsanustopenis: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<actionsanustopenis>>
+    actionsvaginapenisfuck: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<actionsvaginapenisfuck>>
+    actionsvaginatopenis: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<actionsvaginatopenisnew>>
+    actionsvaginatovagina: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<actionsvaginatovaginanew>>
+    actionsvaginatovaginafuck: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<actionsvaginatovaginafucknew>>
+    adultshopicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "adult">>
+    animals: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - '?animals'
+    bathicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<bathroomicon "bath">>
+    bathrobeicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<bathroomicon "robe">>
+    beericon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<foodicon "beer">>
+    binicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<icon "bin.png">>
+    bloodmirroricon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<mirroricon "blood">>
+    bodyparts: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - '?bodypart'
+    breastenlargeicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<procedureicon "breast enlarge">>
+    breastreduceicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<procedureicon "breast reduce">>
+    cellicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "cell">>
+    checkTimeSystem: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - Time cannot desync anymore
+    chickenicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<animalicon "chicken">>
+    clearyardicon:
+      deprecated: true
+      deprecatedSuggestions:
+        - <<farmicon "clear yard">>
+    closedstoreicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "closed">>
+    clothingShop: # Deprecated 0.4.5+
+      deprecated: true
+    clothingShopColorSet: # Deprecated 0.4.5+
+      deprecated: true
+    clothingshopicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "clothing">>
+    coffeeicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<foodicon "coffee">>
+    computericon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<techicon "computer">>
+    condommachineicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<condomicon "machine">>
+    contactsicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<cosmeticsicon "contacts">>
+    cottageicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<farmicon "cottage">>
+    cowicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<animalicon "cow">>
+    danubehouseicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<dooricon "danube">>
+    dilapidatedshopicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "dilapidated">>
+    dogicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<animalicon "dog">>
+    domushouseicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<dooricon "domus">>
+    dorenflaticon: # Deprecated 0.5.1.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<flatsicon>>
+    dyeicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<cosmeticsicon "dyes">>
+    eaticon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<foodicon "eat">>
+    faceimg: # Deprecated 0.5.2+
+      deprecated: true
+    feetgrab: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<feetgrabnew>>
+    flatdooricon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<dooricon>>
+    flatdooropenicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<dooricon "open">>
+    flowericon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<gardenicon "flower">>
+    forestroaddeepicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<forestroadicon "deep">>
+    forestroadtownicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<forestroadicon "town">>
+    forestshopicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "forest">>
+    garden: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - '?garden'
+    generatec1: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<generatey1>>
+    generatec2: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<generatey2>>
+    generatec3: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<generatey3>>
+    generatec4: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<generatey4>>
+    generatec5: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<generatey5>>
+    generatec6: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<generatey6>>
+    gift_recipients_check:
+      deprecated: true
+      deprecatedSuggestions:
+        - canGiftFood()
+    hairchairicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<hairdressericon "chair">>
+    hairgelicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<hairdressericon "gel">>
+    headdeskicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<schoolicon "headdesk">>
+    hitchhikeicon: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<skinicon "hitchhike">>
+    homemirroricon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<mirroricon "home">>
+    horseicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<animalicon "horse">>
+    hotchocicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<foodicon "cocoa">>
+    hotchocstandicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<robinicon "cocoa">>
+    humiliation10: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<stress 40 1>><<trauma 1>>
+    infirmaryicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<schoolicon "infirmary">>
+    lemonadeicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<foodicon "lemonade">>
+    lemonadestandicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<robinicon "lemonade">>
+    libraryicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<schoolicon "library">>
+    lockpickicon: # Deprecated 0.5.2.8+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<lockicon "pick">>
+    lowerbodyparts: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - '?lowerbodypart'
+    masturbationactionsOld: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<masturbationactions>>
+    masturbationeffectsOld: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<masturbationeffects>>
+    meadowicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<farmicon "meadow">>
+    milkshakeicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<foodicon "milkshake">>
+    mirrorDebug: # Deprecated 0.5.2+
+      deprecated: true
+    mirrormodel: # Deprecated 0.5.2+
+      deprecated: true
+    newversionnotification: # Deprecated 0.4.5+
+      deprecated: true
+      description: Has been non-functioning for a good while now
+    olivenewicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<oliveicon>>
+    oralswallow: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<oralswallownew>>
+      orphanagedoorsicon: # Deprecated 0.4.3+
+        deprecated: true
+        deprecatedSuggestions:
+          - <<dooricon "orphanage">>
+    parasitecreamicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<procedureicon "parasite">>
+    partyicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - - <<socialiseicon "party">>
+    paternity_test: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<procedureicon "paternity">>
+    penisenlargeicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<procedureicon "penis enlarge">>
+    penisreduceicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<procedureicon "penis reduce">>
+    pigicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<animalicon "pig">>
+    plaqueicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "plaque">>
+    poollockericon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<lockericon>>
+    pregnancyWatersBrokenPassout: # Deprecrated 0.4.6+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<pregnancyPassout>>
+    printAnd: # Deprecrated 0.4.5.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - and
+      description: |-
+        Prints `and` for use where `and` cannot be used without escaping
+    printTo: # Deprecrated 0.4.5.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - to
+      description: |-
+        Prints `to` for use where `to` cannot be used without escaping
+    prisoncanteenicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "canteen">>
+    prisondooricon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "door">>
+    prisonlaundryicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "laundry">>
+    prisonlifticon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "lift">>
+    prisonmedicalicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "medical">>
+    prisonrunicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<prisonicon "run">>
+    putinlockericon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<lockericon "put in">>
+    registericon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "register">>
+    scarletnewicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<scarleticon>>
+    schoolbuildingicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<schoolicon "building">>
+    schoolcourtyardicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<schoolicon "courtyard">>
+    searchicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<icon "search.png">>
+    secretpathicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<forestroadicon "secret">>
+    setSkinColorBase: # Deprecated 0.5.2+
+      deprecated: true
+    shaveicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<bathroomicon "shave">>
+    shopbuy: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopbuyv2>>
+    shopClothingFilterLoadTraits: # Deprecated 0.4.5+
+      deprecated: true
+    shopClothingFilterSettings: # Deprecated 0.4.5+
+      deprecated: true
+    shopClothingFilterToggle: # Deprecated 0.4.5+
+      deprecated: true
+    shopCustomColors: # Deprecated 0.4.5+
+      deprecated: true
+    shopCustomColorsBars: # Deprecated 0.4.5+
+      deprecated: true
+    shopCustomColorsDisplay: # Deprecated 0.4.5+
+      deprecated: true
+    shopCustomColorsPresets: # Deprecated 0.4.5+
+      deprecated: true
+    shopCustomColorsPresetsLoad: # Deprecated 0.4.5+
+      deprecated: true
+    shopCustomColorsSet: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - '<<setShopCustomColors>>'
+    shopCustomColorsToggle: # Deprecated 0.4.5+
+      deprecated: true
+    shopDefaultOptions: # Deprecated 0.4.3+
+      deprecated: true
+    shopDefaultOptionsToggle: # Deprecated 0.4.3+
+      deprecated: true
+    shoppingcentreicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon>>
+    shopTraitDescription: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - 'setup.shopDetails[_trait].desc'
+    sizeLimitsSettingsOld: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<sizeLimitsSettings>>
+    skinColorInit: # Deprecated 0.5.2+
+      deprecated: true
+    skinColorInitOldSave: # Deprecated 0.5.2+
+      deprecated: true
+    stairschristmasicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<main_hall_icon>>
+    stairsdownicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<stairsicon "down">>
+    stairshalloweenicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<main_hall_icon>>
+    stairsupicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<stairsicon "up">>
+    statbaricons: # Deprecated Old
+      deprecated: true
+      description: "![img](%workspaceDir%/img/ui/point.png)"
+    stripicon: # Deprecated 0.4.5+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<skinicon "strip">>
+    stumpicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<schoolicon "stump">>
+    sweetsicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<foodicon "halloween">>
+        - <<foodicon "sweets">>
+    swimbackicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<swimicon "back">>
+    tailoricon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "tailor">>
+    tanned: # Deprecated 0.5.2+
+      deprecated: true
+    tattooicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "tattoo">>
+    tending_day: # Deprecated 0.5.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - window.tendingDay
+    toileticon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<bathroomicon "toilet">>
+    toyshopicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<shopicon "toy">>
+    updateClothes-obsolete: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<updateClothes>>
+    updateClothingColours-obsolete: # Deprecated Old
+      deprecated: true
+      deprecatedSuggestions:
+        - <<updateClothes>>
+    venteyesicon: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<venticon "eyes">>
+    volleyballicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - - <<socialiseicon "volleyball">>
+    wolfpup: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<wolfcaveicon "pup">>
+    wolfsleep: # Deprecated 0.4.2+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<wolfcaveicon "sleep">>
+    wrenchicon: # Deprecated 0.4.3+
+      deprecated: true
+      deprecatedSuggestions:
+        - <<icon "wrench.png">>

devTools/androidsdk/image/Dockerfile

-# IMPORTANT: this is the last debian version to support jdk8
-# As android studio *still* requires 8, be sure to continue using debian:stretch
-FROM node:14.11-stretch
+# This can potentially be further concised or optimized, but it works for now
+FROM node:buster
+
+# This way we can build with jdk-8 while on a newer image
+RUN apt install -y wget apt-transport-https
+RUN mkdir -p /etc/apt/keyrings
+RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc
+RUN echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+RUN apt-get update
+RUN apt install -y temurin-8-jdk
+
 
 # Add backports to make it easier to install npm
 # RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/buster-backports.list
@@ -8,7 +16,6 @@ RUN \
 apt-get update && \
 apt-get install -y --no-install-recommends \
     lib32stdc++6 lib32z1 \
-    openjdk-8-jdk-headless \
     gradle \
     unzip
 
@@ -30,4 +37,5 @@ COPY "cordova" "/cordovasrc"
 WORKDIR "/cordovasrc"
 RUN npm ci
 RUN npm run env -- cordova telemetry off
-RUN npm run build-debug-ci
\ No newline at end of file
+RUN npm run build-debug-ci
+

devTools/androidsdk/image/cordova/config.xml

 <?xml version='1.0' encoding='utf-8'?>
 <widget 
     id="dol" 
-    version="0.4.1.8" 
+    version="0.5.0.4" 
     xmlns="http://www.w3.org/ns/widgets" 
     xmlns:cdv="http://cordova.apache.org/ns/1.0"
     android-packageName="com.vrelnir.DegreesOfLewdity"

devTools/apkbuilder/.gitignore

+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+.DS_Store
+
+# Generated by package manager
+node_modules/
+
+# Generated by Cordova
+/plugins/
+/platforms/
+
+# android sdk probably shouldn't go into our git
+/androidsdk/
+
+# generated apks
+/dist/*
+
+# temp folder
+/tmp/
+
+# generated automatically AND contains keystore's password, never include this into commits
+build.json
+# no idea what it's for
+package-lock.json
+
+# Generated by Cordova
+/plugins/
+/platforms/

devTools/apkbuilder/README-linux

+cordova apk builder for primarily DoL
+
+dependencies: (in parentheses are versions at the moment of writing)
+- nodejs stable (20.10.0), with npm and npx installed
+- gradle latest (8.5)
+- openjdk 17 (Temurin-17.0.8.1+1)
+- commandlinetools latest (10406996_latest) https://developer.android.com/studio#cmdline-tools scroll to the bottom of the page
+
+to create a building environment, install nodejs, gradle and openjdk with your favorite package manager, then unzip and place `bin/`, `lib/`, and `source.properties` from commandlinetools archive into `androidsdk/cmdline-tools/latest`, then run ./setup_deps.sh. this only needs to be done once per repository.
+
+debug builds are set up so they can be installed in parallel with release builds. to run debug build, run `./build_app_debug.sh`. compiled apk will be sent to the `../../dist/` directory.
+
+release builds require official dol.keystore to sign the resulting apk. using any other keystore will make the app incompatible with official release.
+in vast majority of cases, you'll be better off with a debug build, but if you're a mod dev and you really want your apk signed, then you can use the release build. first, you need to change `android-packageName` in `config.xml`, so it won't conflict with official app. second, generate a new keystore by running `keytool -genkey -v -keystore dol.keystore -alias dol -keyalg RSA -keysize 2048 -deststoretype pkcs12 -validity 9999` command, included with jdk. once done, place generated `dol.keystore` into `../../keys`.
+after that, you can run `./build_app_release.sh`. it will ask for password to keystore. once the build is successful, you can uncomment the line in `./build_app_release.sh` to stop it from further asking for passwords. like with debug builds, compiled apks are sent to `../../dist`.

devTools/apkbuilder/README-windows.txt

+cordova apk builder for primarily DOL
+
+# Installing dependencies
+## nodejs latest
+- download from https://nodejs.org/, ~25.4mb
+- doesn't matter if it's LTS or latest
+- options "npm package manager" and "Add to PATH" must be selected
+- "Automatically install the necessary tools" is optional
+
+## openjdk / temurin 17
+- download the latest version of .msi installer for windows from https://adoptium.net/temurin/releases/?version=17&package=jdk&arch=x64, ~171mb
+- when installing, choose to install "Set JAVA_HOME variable" option
+
+## android commandline-tools latest
+- download from https://developer.android.com/studio#cmdline-tools, links for tools-only are at the bottom of the page, ~146mb
+- in the folder with this README, open androidsdk\cmdline-tools\latest, and extract "bin", "lib", and "source.properties" from the downloaded archive from the previous step into it. there should be no other sub-folders
+
+## gradle 7.4.2
+- download from https://gradle.org/next-steps/?version=7.4.2&format=bin, ~110mb
+- extract the archive into `androidsdk/gradle`
+
+## the rest
+- once everything above is done, run `setup_deps.bat`
+
+# Building the apk
+## debug build
+debug builds require no additional steps and can be installed in parallel with official app.
+just run `build_app_debug.bat` batch file. compiled apk will appear in the dist folder.
+
+## release build
+if you have the official dol.keystore, run `build_app_debug.bat` batch file.
+if you don't have one, stick to debug builds, they're not any less good.

devTools/apkbuilder/androidsdk/cmdline-tools/latest/README.txt

+ bin/, lib/, source.properties, and NOTICE.txt from the cmdline-tools archive should go into this folder

devTools/apkbuilder/androidsdk/gradle/README.txt

+if you're on windows, extract the gradle archive's bin/, lib/, etc. here

devTools/apkbuilder/build_app_debug.bat

+@echo off
+SET "PATH=%CD%\androidsdk\commandline-tools\latest\bin;%CD%\androidsdk\gradle\bin;%PATH%"
+SET "ANDROID_HOME=%CD%\androidsdk"
+SET "ANDROID_SDK_ROOT=%ANDROID_HOME%"
+
+IF NOT EXIST "..\..\Degrees of Lewdity.html" (
+	IF EXIST "..\..\Degrees of Lewdity VERSION.html" (
+		copy "..\..\Degrees of Lewdity VERSION.html" "..\..\Degrees of Lewdity.html"
+	) ELSE (
+		echo game is not compiled. make sure to run compile.bat first
+		pause
+		exit
+	)
+)
+
+@echo on
+call node scripts/build_app.js
+
+pause

devTools/apkbuilder/build_app_debug.sh

+#!/bin/sh
+
+# set up the environment
+ANDROID_HOME="$PWD/androidsdk/" \
+ANDROID_SDK_ROOT="$ANDROID_HOME" \
+ANDROID_PATH="$ANDROID_HOME/cmdline-tools/latest/bin" \
+PATH="./androidsdk/cmdline-tools/latest/bin:$PATH" \
+node scripts/build_app.js

devTools/apkbuilder/build_app_release.bat

+@echo off
+SET "PATH=%CD%\androidsdk\commandline-tools\latest\bin;%CD%\androidsdk\gradle\bin;%PATH%"
+SET "ANDROID_HOME=%CD%\androidsdk"
+SET "ANDROID_SDK_ROOT=%ANDROID_HOME%"
+
+IF NOT EXIST "..\..\Degrees of Lewdity.html" (
+REM windows' compile.bat is dumb about versions
+	IF EXIST "..\..\Degrees of Lewdity VERSION.html" (
+		copy "..\..\Degrees of Lewdity VERSION.html" "..\..\Degrees of Lewdity.html"
+	) ELSE (
+		echo game is not compiled. make sure to run compile.bat first
+		pause
+		exit
+	)
+)
+
+REM uncomment the line below (remove "REM") to skip prompt for password when it's set correctly
+REM SET SKIP_PASSWORD=true
+
+SET BUILD_RELEASE=true
+@echo on
+call node scripts/build_app.js
+
+pause