From 37ca27427eace5efa205a9f5de95674df57a3e76 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sun, 5 May 2019 17:13:35 +0200
Subject: [PATCH] initial commit
---
.eslintrc.json | 3 ++-
src/art/vector/VectorArtJS.js | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/.eslintrc.json b/.eslintrc.json
index 94018bf881d..6be7f200842 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -30,12 +30,13 @@
"rules": {
"semi": ["warn", "always"],
"semi-spacing": "warn",
- "semi-style": "warn",
+ "semi-style": "warn",
"block-spacing": ["warn", "always"],
"curly": ["warn", "all"],
"eqeqeq": "warn",
"no-fallthrough": "error",
"space-before-function-paren": ["warn", "never"],
+ "template-curly-spacing": ["warn", "never"],
"no-trailing-spaces": "warn",
"no-unneeded-ternary": "warn",
"camelcase": "warn",
diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index e407e3c9298..accfb9ada6e 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -1276,16 +1276,16 @@ window.VectorArt = (function() {
} else if (slave.clothes === "restrictive latex") {
/* slave wears restrictive latex - display most skin as if it was rubber */
/* nice latex does not cover any privates. */
- T.boobSkinStyle = "fill:" + T.skinColour + ";";
- T.penisSkinStyle = "fill:" + T.skinColour + ";";
- T.scrotumSkinStyle = "fill:" + T.skinColour + ";";
- T.torsoSkinStyle = "fill:" + T.skinColour + ";";
+ T.boobSkinStyle = `fill:${T.skinColour};`;
+ T.penisSkinStyle = `fill:${T.skinColour};`;
+ T.scrotumSkinStyle = `fill:${T.skinColour};`;
+ T.torsoSkinStyle = `fill:${T.skinColour};`;
/* rest of body is covered in latex */
T.skinColour = outfitBaseColour;
T.bellybuttonStyle = outfitBaseColour;
} else if (slave.clothes === "a latex catsuit") {
/* nice latex does not cover head. */
- T.headSkinStyle = "fill:" + T.skinColour + ";";
+ T.headSkinStyle = `fill:${T.skinColour};`;
/* rest of body is covered in latex */
T.skinColour = outfitBaseColour;
/* catsuit covers areolae and crotch, too */
@@ -1296,7 +1296,7 @@ window.VectorArt = (function() {
T.bellybuttonStyle = outfitBaseColour;
} else if (slave.clothes === "a comfortable bodysuit") {
/* nice bodysuit does not cover head. */
- T.headSkinStyle = "fill:" + T.skinColour + ";";
+ T.headSkinStyle = `fill:${T.skinColour};`;
/* rest of body is covered in bodysuit */
T.skinColour = outfitBaseColour;
T.bellySkinStyle = outfitBaseColour;
@@ -1600,10 +1600,10 @@ window.VectorArt = (function() {
/* override color in case of full body latex outfit, or custom color*/
if (slave.clothes === "a Fuckdoll suit" || slave.clothes === "restrictive latex") {
T.shoeColour = T.skinColour;
- T.shoeShadowColour = T.shoeColour + ";opacity: 0.5"; /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
+ T.shoeShadowColour = `${T.shoeColour};opacity: 0.5`; /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
} else if (slave.shoeColor !== undefined) {
- T.shoeColour = slave.shoeColor + ";opacity: 0.4"; /* shoe color selected by user */
- T.shoeShadowColour = T.shoeColour + ";opacity: 0.5"; /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
+ T.shoeColour = `${slave.shoeColor};opacity: 0.4`; /* shoe color selected by user */
+ T.shoeShadowColour = `${T.shoeColour};opacity: 0.5`; /* TODO: do not abuse "color" variable for style definitions. do not rely on dark background for shadow effect either. */
} else {
T.shoeShadowColour = "#616a6b";
if (slave.shoes === "none") {
@@ -2674,7 +2674,7 @@ window.VectorArt = (function() {
window.LegacyVectorArt = function(slave, artSize) {
const filePath = "'resources/vector";
- const skinFilePath = filePath + "/body/white";
+ const skinFilePath = `${filePath}/body/white`;
const wearingLatex = slave.clothes === "a Fuckdoll suit" || slave.clothes === "restrictive latex" || slave.clothes === "a latex catsuit";
let hairStyle, underArmHStyle, leftArmType, rightArmType, buttSize, legSize, shoesType, torsoSize, boobSize, ballSize, penisSize;
let needBoobs = true;
@@ -2789,7 +2789,7 @@ window.LegacyVectorArt = function(slave, artSize) {
legSize = "wide";
}
if (slave.amp === 1) {
- legSize = "stump " + legSize;
+ legSize = `stump ${legSize}`;
}
if (wearingLatex === true && slave.amp !== 1) {
--
GitLab