diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js index ec4ad98a80e5a3610d1b7a355f3475830950e902..89eac50704e2c2a7c6a59a1d787d290ca250fdfa 100644 --- a/src/art/vector/VectorArtJS.js +++ b/src/art/vector/VectorArtJS.js @@ -39,8 +39,7 @@ window.VectorArt = (function() { ArtVectorAnalAccessories(); ArtVectorButt(); ArtVectorLeg(); - if (slave.amp !== 1) { - /* includes shoes and leg outfits*/ + if (slave.amp !== 1) { /* includes shoes and leg outfits*/ ArtVectorFeet(); } ArtVectorTorso(); @@ -246,8 +245,7 @@ window.VectorArt = (function() { } else { legSize = "Thick"; } - } else { - /* .hips === 2 or 3 */ + } else { /* .hips === 2 or 3 */ if (slave.weight <= -11) { legSize = "Wide"; } else { @@ -269,8 +267,7 @@ window.VectorArt = (function() { penisDrawtime = -1; /* no penis to draw */ } else if (State.variables.showClothingErection) { penisDrawtime = 0; /* default is to draw before boobs/belly */ - switch (slave.clothes) { - /* BULGE OUTFITS WITH ERECTION: LONG OUTFITS */ + switch (slave.clothes) { /* BULGE OUTFITS WITH ERECTION: LONG OUTFITS */ case "an apron": case "a ball gown": case "a biyelgee costume": @@ -399,8 +396,7 @@ window.VectorArt = (function() { } } else { penisDrawtime = 0; /* default is to draw before boobs/belly */ - switch (slave.clothes) { - /* BULGE OUTFITS LONG+MEDIUM OUTFITS */ + switch (slave.clothes) { /* BULGE OUTFITS LONG+MEDIUM OUTFITS */ case "a ball gown": case "a biyelgee costume": case "a burkini": @@ -633,13 +629,11 @@ window.VectorArt = (function() { /* - changed arm calculation block position*/ /* - added brackets to make boolean logic run */ - if (slave.amp === 1) { - /* Many amputee clothing art files exist, but draw nothing.They are excluded for now to reduce on rendering time + if (slave.amp === 1) { /* Many amputee clothing art files exist, but draw nothing.They are excluded for now to reduce on rendering time r += jsInclude("Art_Vector_Arm_Right_None"); r += jsInclude("Art_Vector_Arm_Left_None"); */ - } else { - /* is not amputee or has limbs equipped so running arm calculation block */ + } else { /* is not amputee or has limbs equipped so running arm calculation block */ if (slave.amp === 0) { r += jsInclude(`Art_Vector_Arm_Right_${rightArmType}`); r += jsInclude(`Art_Vector_Arm_Left_${leftArmType}`); @@ -662,8 +656,7 @@ window.VectorArt = (function() { r += jsInclude("Art_Vector_Arm_Right_Low_MLight"); } } - } else if (slave.PLimb === 1 || slave.PLimb === 2) { - /* slave is an amputee and has PLimbs equipped */ + } else if (slave.PLimb === 1 || slave.PLimb === 2) { /* slave is an amputee and has PLimbs equipped */ if (slave.amp === -1) { r += jsInclude(`Art_Vector_Arm_Right_ProstheticBasic_${rightArmType}`); r += jsInclude(`Art_Vector_Arm_Left_ProstheticBasic_${leftArmType}`); @@ -801,8 +794,7 @@ window.VectorArt = (function() { } function ArtVectorBelly() { - if (slave.belly >= 2000) { - /* add pregnancy belly, scale dynamically (clothing and addons can be scaled, too) */ + if (slave.belly >= 2000) { /* add pregnancy belly, scale dynamically (clothing and addons can be scaled, too) */ /* TODO: add check in penis control. do not draw penis atop belly if _art_belly_scale_factor > 1. */ bellyScaleFactor = 0.300 * Math.log(0.011 * slave.belly) * heightScaleFactor; artTranslationX = -262 * (bellyScaleFactor - 1); @@ -908,8 +900,7 @@ window.VectorArt = (function() { } function ArtVectorBoob() { - if (slave.boobs < 300) { - /* BEWARE: this threshold may be used in other art-related code, too */ + if (slave.boobs < 300) { /* BEWARE: this threshold may be used in other art-related code, too */ /* boobs too small - draw areolae directly onto torso */ } else { r += jsInclude("Art_Vector_Boob_Alt"); @@ -920,8 +911,7 @@ window.VectorArt = (function() { } } } - switch (slave.clothes) { - /* display nipples/areola for the following clothes */ + switch (slave.clothes) { /* display nipples/areola for the following clothes */ case "a chattel habit": case "a fallen nuns habit": case "a Fuckdoll suit": @@ -985,8 +975,7 @@ window.VectorArt = (function() { } function ArtVectorBoobAddons() { - if (slave.boobs < 300) { - /* boobs too small: do not show boob-related art */ + if (slave.boobs < 300) { /* boobs too small: do not show boob-related art */ /* BEWARE: this threshold should be kept in sync with the one in Art_Vector_Boob_ */ } else { switch (slave.clothes) { @@ -1027,8 +1016,7 @@ window.VectorArt = (function() { r += jsInclude(`Art_Vector_Boob_Outfit_${clothing2artSuffix(slave.clothes)}`); } } - if (V.showBodyMods === 1 && (slave.nipplesPiercing > 0 || slave.areolaePiercing > 0)) { - /* shows nipple piercings in game when selected; piercings will show on the outfits listed below */ + if (V.showBodyMods === 1 && (slave.nipplesPiercing > 0 || slave.areolaePiercing > 0)) { /* shows nipple piercings in game when selected; piercings will show on the outfits listed below */ switch (slave.clothes) { case "a chattel habit": case "a comfortable bodysuit": @@ -1087,8 +1075,7 @@ window.VectorArt = (function() { r += jsInclude(`Art_Vector_Butt_ProstheticBasic_${buttSize}`); } else if (slave.amp === -2) { r += jsInclude(`Art_Vector_Butt_ProstheticSexy_${buttSize}`); - } else if (slave.amp === -3) { - /* reverted to regular SVG to match description */ + } else if (slave.amp === -3) { /* reverted to regular SVG to match description */ r += jsInclude(`Art_Vector_Butt_ProstheticBeauty_${buttSize}`); } else if (slave.amp === -4) { r += jsInclude(`Art_Vector_Butt_ProstheticCombat_${buttSize}`); @@ -1158,8 +1145,7 @@ window.VectorArt = (function() { } } if (slave.vaginalAccessory !== "none") { - switch (slave.clothes) { - /* shows vaginal accessories on the outfits below */ + switch (slave.clothes) { /* shows vaginal accessories on the outfits below */ case "a bra": case "a button-up shirt": case "a button-up shirt and panties": @@ -1241,20 +1227,17 @@ window.VectorArt = (function() { setHairColor(); setShoeColor(); - function setOutfitColor() { - /* TODO: rewrite all textual descriptions not to explicitly mention the latex being of black color. */ + function setOutfitColor() { /* TODO: rewrite all textual descriptions not to explicitly mention the latex being of black color. */ if (wearingLatex === true || slave.clothes === "a cybersuit") { outfitBaseColour = slave.clothingBaseColor || "#515351"; - } else if (slave.clothes === "a comfortable bodysuit") { - /* use custom color, or use default latex color */ + } else if (slave.clothes === "a comfortable bodysuit") { /* use custom color, or use default latex color */ outfitBaseColour = slave.clothingBaseColor || "#464646"; } /* use custom color, or use default bodysuit color */ /* head addons */ if (slave.collar === "porcelain mask") { T.glassesColor = slave.glassesColor || "#FFFFFF"; - } else { - /* use custom color or white */ + } else { /* use custom color or white */ T.glassesColor = slave.glassesColor || "#010101"; } /* use custom color or default */ @@ -1280,14 +1263,12 @@ window.VectorArt = (function() { T.bellySkinStyle = undefined; /* BEGIN SKIN COLOR OVERRIDES FOR LATEX CLOTHING EMULATION */ - if (slave.clothes === "a Fuckdoll suit") { - /* slave is a fuckdoll - display all skin as if it was black rubber */ + if (slave.clothes === "a Fuckdoll suit") { /* slave is a fuckdoll - display all skin as if it was black rubber */ T.skinColour = outfitBaseColour; T.areolaStyle = "fill:rgba(81,83,81,1);"; T.labiaStyle = T.areolaStyle; T.bellybuttonStyle = T.areolaStyle; - } else if (slave.clothes === "restrictive latex") { - /* slave wears restrictive latex - display most skin as if it was rubber */ + } 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 + ";"; @@ -1296,19 +1277,16 @@ window.VectorArt = (function() { /* 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. */ + } else if (slave.clothes === "a latex catsuit") { /* nice latex does not cover head. */ T.headSkinStyle = "fill:" + T.skinColour + ";"; /* rest of body is covered in latex */ T.skinColour = outfitBaseColour; /* catsuit covers areolae and crotch, too */ T.bellybuttonStyle = outfitBaseColour; - } else if (slave.clothes === "a cybersuit") { - /* rest of body is covered in latex */ + } else if (slave.clothes === "a cybersuit") { /* rest of body is covered in latex */ T.skinColour = outfitBaseColour; T.bellybuttonStyle = outfitBaseColour; - } else if (slave.clothes === "a comfortable bodysuit") { - /* nice bodysuit does not cover head. */ + } else if (slave.clothes === "a comfortable bodysuit") { /* nice bodysuit does not cover head. */ T.headSkinStyle = "fill:" + T.skinColour + ";"; /* rest of body is covered in bodysuit */ T.skinColour = outfitBaseColour; @@ -1606,8 +1584,7 @@ window.VectorArt = (function() { T.sclerae = extractColor(slave.sclerae); } - function setShoeColor() { - /* BEWARE: _shoeColour is read by Wardrobe Use */ + function setShoeColor() { /* BEWARE: _shoeColour is read by Wardrobe Use */ /* note: only heels use this _shoeShadowColour */ /* override color in case of full body latex outfit, or custom color*/ @@ -1630,7 +1607,7 @@ window.VectorArt = (function() { function ArtVectorCollar() { r += jsInclude("Art_Vector_Clavicle"); - /* TODO": find out where "uncomfortable leather" collar art went */ + /* TODO: find out where "uncomfortable leather" collar art went */ switch (slave.collar) { case "leather with cowbell": r += jsInclude("Art_Vector_Collar_Cowbell"); @@ -1802,8 +1779,7 @@ window.VectorArt = (function() { } function ArtVectorHairBack() { - if (hairLength !== undefined) { - /* Don't draw hair if it isn't there */ + if (hairLength !== undefined) { /* Don't draw hair if it isn't there */ if (slave.fuckdoll !== 0 || (slave.bald !== 0 && slave.hStyle === "bald")) { r += jsInclude("Art_Vector_Hair_Back_NoHair"); } else { @@ -1879,8 +1855,7 @@ window.VectorArt = (function() { } function ArtVectorHairFore() { - if (hairLength !== undefined) { - /* Don't draw hair if it isn't there */ + if (hairLength !== undefined) { /* Don't draw hair if it isn't there */ if (slave.fuckdoll !== 0 || (slave.bald !== 0 && slave.hStyle === "bald")) { r += jsInclude("Art_Vector_Hair_Fore_NoHair"); } else { @@ -2419,8 +2394,7 @@ window.VectorArt = (function() { } /* ADDONS */ - if (slave.fuckdoll === 0) { - /* Fuckdolls cannot be decorated */ + if (slave.fuckdoll === 0) { /* Fuckdolls cannot be decorated */ if (slave.collar === "dildo gag") { r += jsInclude("Art_Vector_Dildo_Gag"); } else if (slave.collar === "ball gag") { @@ -2487,8 +2461,7 @@ window.VectorArt = (function() { } } else if (slave.amp === 1) { r += jsInclude("Art_Vector_Stump"); - } else if (slave.PLimb === 1 || slave.PLimb === 2) { - /* slave is an amputee and has PLimbs equipped */ + } else if (slave.PLimb === 1 || slave.PLimb === 2) { /* slave is an amputee and has PLimbs equipped */ if (slave.amp === -1) { r += jsInclude(`Art_Vector_Leg_ProstheticBasic_${legSize}`); } else if (slave.amp === -2) { @@ -2497,8 +2470,7 @@ window.VectorArt = (function() { r += jsInclude(`Art_Vector_Leg_ProstheticBeauty_${legSize}`); } else if (slave.amp === -4) { r += jsInclude(`Art_Vector_Leg_ProstheticCombat_${legSize}`); - } else { - /* slave.amp === -5 */ + } else { /* slave.amp === -5 */ r += jsInclude(`Art_Vector_Leg_ProstheticSwiss_${legSize}`); } } @@ -2516,8 +2488,7 @@ window.VectorArt = (function() { } r += jsInclude("Art_Vector_Pussy_Tattoo"); } - if (slave.physicalAge < 11) { - /* these art files exist, but draw empty svg's. Commented out for now to save on rendering time + if (slave.physicalAge < 11) { /* these art files exist, but draw empty svg's. Commented out for now to save on rendering time r += jsInclude("Art_Vector_Pubic_Hair_None"); r += jsInclude("Art_Vector_Pubic_Hair_Underarm_None"); */ @@ -2598,8 +2569,7 @@ window.VectorArt = (function() { } function ArtVectorPussyPiercings() { - switch (slave.clothes) { - /* piercings display on these clothes */ + switch (slave.clothes) { /* piercings display on these clothes */ case "a bra": case "a button-up shirt": case "a fallen nuns habit": @@ -2666,7 +2636,7 @@ window.VectorArt = (function() { case "choosing her own clothes": case "no clothing": break; /* no torso outfit */ - /* manually handle special cases */ + /* manually handle special cases */ case "a cybersuit": r += jsInclude(`Art_Vector_Torso_Outfit_Latex_${torsoSize}`); break; @@ -2797,15 +2767,13 @@ window.LegacyVectorArt = function(slave, artSize) { /* Leg + 1 size up when chubby or fat */ if (slave.hips < 0) { - if (slave.weight > 95) { - /* Chubby */ + if (slave.weight > 95) { /* Chubby */ legSize = "normal"; } else { legSize = "narrow"; } } else if (slave.hips === 0) { - if (slave.weight > 95) { - /* Chubby */ + if (slave.weight > 95) { /* Chubby */ legSize = "wide"; } else { legSize = "normal"; @@ -2828,15 +2796,13 @@ window.LegacyVectorArt = function(slave, artSize) { if (slave.shoes === "heels") { shoesType = "heel"; } else if (slave.shoes === "extreme heels") { - if (slave.weight > 95) { - /* Chubby */ + if (slave.weight > 95) { /* Chubby */ shoesType = "extreme heel wide"; } else { shoesType = "extreme heel"; } } else if (slave.shoes === "boots") { - if (slave.weight > 95) { - /* Chubby */ + if (slave.weight > 95) { /* Chubby */ shoesType = "boot wide"; } else { shoesType = "boot"; @@ -2972,8 +2938,7 @@ window.LegacyVectorArt = function(slave, artSize) { /* if pregnant or has a belly */ if (slave.belly >= 5000) { r += `<img class='paperdoll' src=${skinFilePath}/preg belly 5000.svg' style='${skinFilter}'>`; - if (slave.navelPiercing >= 1) { - /* Navel Piercing*/ + if (slave.navelPiercing >= 1) { /* Navel Piercing*/ r += `<img class='paperdoll' src=${filePath}/body/addon/preg navel piercing.svg'/>`; } if (slave.navelPiercing === 2) { @@ -2989,8 +2954,7 @@ window.LegacyVectorArt = function(slave, artSize) { r += `<img class='paperdoll' src=${filePath}/body/addon/preg navel piercing heavy.svg'/>`; */ } else { - if (slave.navelPiercing >= 1) { - /* Navel Piercing*/ + if (slave.navelPiercing >= 1) { /* Navel Piercing*/ r += `<img class='paperdoll' src=${filePath}/body/addon/navel piercing.svg'/>`; } if (slave.navelPiercing === 2) {