From 1729f6fbb571fcda68bb9477bc589899bc32049c Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 8 Dec 2018 21:04:10 -0600
Subject: [PATCH] OK
---
src/art/artWidgets.tw | 10 ++---
src/art/vector/Set_Color_Hair.tw | 2 +-
src/art/vector/Set_Color_Outfit.tw | 6 +--
src/art/vector/Set_Color_Outfit_JS.tw | 4 +-
src/art/vector/Set_Color_Shoe.tw | 2 +-
src/art/vector/Set_Color_Skin.tw | 6 +--
src/art/vector/Set_Color_Skin_JS.tw | 4 +-
.../vectorRevampedArtControlJS.tw | 44 +++++++++----------
src/uncategorized/wardrobeUse.tw | 8 ++--
9 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw
index 9d6b3128908..c450a5dd1f1 100644
--- a/src/art/artWidgets.tw
+++ b/src/art/artWidgets.tw
@@ -39,10 +39,10 @@ $args[2]: icon UI Display for vector art, 1 for on.
/* prepare HTML color codes for slave display */
/* note: latex clothing is mostly emulated by rubber color for skin (and shoes) */
/* TODO: consistently use American "color" instead of "colour" for all identifiers */
-<<include Art_Vector_Set_Color_Outfit_>>
-<<include Art_Vector_Set_Color_Skin_>>
-<<include Art_Vector_Set_Color_Hair_>>
-<<include Art_Vector_Set_Color_Shoe_>>
+<<include Art_Vector_Set_Colour_Outfit_>>
+<<include Art_Vector_Set_Colour_Skin_>>
+<<include Art_Vector_Set_Colour_Hair_>>
+<<include Art_Vector_Set_Colour_Shoe_>>
<</silently>>
<<include Art_Vector_Generate_Stylesheet_>>
/*
@@ -96,7 +96,7 @@ vector art added later is drawn over previously added art
<<if $args[0].customHairVector>>
<<set _hairStyle = $args[0].customHairVector>>
<<else>>
- <<set _hairStyle = ["neat", "up", "ponytail", "tails", "bun", "luxurious", "messy", "eary", "dreadlocks", "braided", "afro", "strip", "trimmed", "buzzcut"].includes($args[0].hStyle) ? $args[0].hStyle : "neat">>
+ <<set _hairStyle = ["afro", "braided", "bun", "buzzcut", "dreadlocks", "eary", "luxurious", "messy", "neat", "ponytail", "strip", "tails", "trimmed", "up"].includes($args[0].hStyle) ? $args[0].hStyle : "neat">>
<</if>>
<<set _underArmHStyle = $args[0].underArmHStyle>>
diff --git a/src/art/vector/Set_Color_Hair.tw b/src/art/vector/Set_Color_Hair.tw
index 25d4a077b76..01bbb628283 100644
--- a/src/art/vector/Set_Color_Hair.tw
+++ b/src/art/vector/Set_Color_Hair.tw
@@ -1,4 +1,4 @@
-:: Art_Vector_Set_Color_Hair_ [nobr]
+:: Art_Vector_Set_Colour_Hair_ [nobr]
/*
"Free-Cities Dyes (taken from Cosmetic Rules Assistant Settings)"-
diff --git a/src/art/vector/Set_Color_Outfit.tw b/src/art/vector/Set_Color_Outfit.tw
index e8d86f09405..30e6f7e4c39 100644
--- a/src/art/vector/Set_Color_Outfit.tw
+++ b/src/art/vector/Set_Color_Outfit.tw
@@ -1,10 +1,10 @@
-:: Art_Vector_Set_Color_Outfit_
+:: Art_Vector_Set_Colour_Outfit_
-/* BEWARE: _outfitBaseColor is used by Art_Vector_Set_Color_Skin_ */
+/* BEWARE: _outfitBaseColor is used by Art_Vector_Set_Colour_Skin_ */
/* BEWARE: _outfitBaseColor is read by Wardrobe Use */
/* BEWARE: _glassesColor is read by Wardrobe Use */
-<<set _s = Art_Vector_Set_Color_Outfit(_artSlave) >>
+<<set _s = Art_Vector_Set_Colour_Outfit(_artSlave) >>
<<set _outfitBaseColor = _s.outfitBaseColor>>
<<set _glassesColor = _s.glassesColor>>
<<set _eyeColor = _s.eyeColor>>
\ No newline at end of file
diff --git a/src/art/vector/Set_Color_Outfit_JS.tw b/src/art/vector/Set_Color_Outfit_JS.tw
index 4dc2d3f2e80..7b8836ec726 100644
--- a/src/art/vector/Set_Color_Outfit_JS.tw
+++ b/src/art/vector/Set_Color_Outfit_JS.tw
@@ -1,6 +1,6 @@
-:: Art_Vector_Set_Color_Outfit_JS [script]
+:: Art_Vector_Set_Colour_Outfit_JS [script]
-window.Art_Vector_Set_Color_Outfit = function(artSlave) {
+window.Art_Vector_Set_Colour_Outfit = function(artSlave) {
var s = {
outfitBaseColor : undefined,
diff --git a/src/art/vector/Set_Color_Shoe.tw b/src/art/vector/Set_Color_Shoe.tw
index 524af5a916d..676973d8d8b 100644
--- a/src/art/vector/Set_Color_Shoe.tw
+++ b/src/art/vector/Set_Color_Shoe.tw
@@ -1,4 +1,4 @@
-:: Art_Vector_Set_Color_Shoe_ [nobr]
+:: Art_Vector_Set_Colour_Shoe_ [nobr]
/* courtesy of Nov-X */
diff --git a/src/art/vector/Set_Color_Skin.tw b/src/art/vector/Set_Color_Skin.tw
index 639426720c4..9399a5fe64c 100644
--- a/src/art/vector/Set_Color_Skin.tw
+++ b/src/art/vector/Set_Color_Skin.tw
@@ -1,8 +1,8 @@
-:: Art_Vector_Set_Color_Skin_
+:: Art_Vector_Set_Colour_Skin_
-/* BEWARE: _outfitBaseColor is set by Art_Vector_Set_Color_Outfit_ */
+/* BEWARE: _outfitBaseColor is set by Art_Vector_Set_Colour_Outfit_ */
-<<set _s = Art_Vector_Set_Color_Skin(_artSlave, _outfitBaseColor) >>
+<<set _s = Art_Vector_Set_Colour_Skin(_artSlave, _outfitBaseColor) >>
<<set _areolaStyle = _s.areolaStyle>>
<<set _bellySkinStyle = _s.bellySkinStyle>>
<<set _boobSkinStyle = _s.boobSkinStyle>>
diff --git a/src/art/vector/Set_Color_Skin_JS.tw b/src/art/vector/Set_Color_Skin_JS.tw
index 30dae14673a..d5a68da6e8b 100644
--- a/src/art/vector/Set_Color_Skin_JS.tw
+++ b/src/art/vector/Set_Color_Skin_JS.tw
@@ -1,6 +1,6 @@
-:: Art_Vector_Set_Color_Skin_JS [script]
+:: Art_Vector_Set_Colour_Skin_JS [script]
-window.Art_Vector_Set_Color_Skin = function(artSlave, outfitBaseColor) {
+window.Art_Vector_Set_Colour_Skin = function(artSlave, outfitBaseColor) {
/* create an aggregator object yielding all computed styles */
var s = {
diff --git a/src/art/vector_revamp/vectorRevampedArtControlJS.tw b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
index 510830cc0b8..72a9e372980 100644
--- a/src/art/vector_revamp/vectorRevampedArtControlJS.tw
+++ b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
@@ -419,9 +419,9 @@ class ClothingControl {
}
}
- get restrictiveLatex() {
+ get restrictiveLatex() {
var defaultOutfitColor = "#515351";
- var areolaColor = "#383838";
+ var areolaColor = "#383838";
return {
bodySettings: {
showEyes: false,
@@ -638,7 +638,7 @@ class RevampedArtControl {
copyProperties(objTo, objFrom) {
for (var attr in objFrom) {
- if (objFrom.hasOwnProperty(attr))
+ if (objFrom.hasOwnProperty(attr))
objTo[attr] = objFrom[attr];
}
}
@@ -649,7 +649,7 @@ class RevampedArtControl {
applyClothingStyleSettings(styleSettings) {
for (var attr in styleSettings) {
- if (styleSettings.hasOwnProperty(attr))
+ if (styleSettings.hasOwnProperty(attr))
this.copyProperties(this.styleControl[attr], styleSettings[attr]);
}
}
@@ -746,7 +746,7 @@ class RevampedArtControl {
else if (this.artSlave.trust >= -20) {
if (this.artSlave.devotion <= 20) {
rightArmType = "Low";
- }
+ }
else
{
rightArmType = "High";
@@ -833,7 +833,7 @@ class RevampedArtControl {
case "dreadlocks":
result.push("Art_Vector_Revamp_Hair_Back_Dreadlocks_" + this.hairLength);
break;
- default:
+ default:
result.push("Art_Vector_Revamp_Hair_Back_Messy_" + this.hairLength);
}
@@ -845,7 +845,7 @@ class RevampedArtControl {
var leftArmType = "";
var rightArmType = "";
-
+
if (this.artSlave.amp == 1) {
result.push("Art_Vector_Revamp_Arm_Stump");
}
@@ -883,7 +883,7 @@ class RevampedArtControl {
buttSize = 2;
else if (this.artSlave.butt > 2)
buttSize = 1;
- else
+ else
buttSize = 0;
result.push("Art_Vector_Revamp_Butt_" + buttSize);
@@ -1000,7 +1000,7 @@ class RevampedArtControl {
{
this.pubicTattooText = this.artSlave.dick != 0 ? "Useless" : "Fucktoy";
result.push("Art_Vector_Revamp_Pussy_Tattoo");
- }
+ }
switch(this.artSlave.pubicHStyle)
{
case "strip":
@@ -1095,7 +1095,7 @@ class RevampedArtControl {
var ballsSize = 0;
- if (this.artSlave.scrotum >= 6)
+ if (this.artSlave.scrotum >= 6)
ballsSize = 4;
else if (this.artSlave.scrotum >= 4)
ballsSize = 3;
@@ -1103,7 +1103,7 @@ class RevampedArtControl {
ballsSize = 2;
else if (this.artSlave.scrotum >= 2)
ballsSize = 1;
- else
+ else
ballsSize = 0;
result.push("Art_Vector_Revamp_Balls_" + ballsSize);
@@ -1229,7 +1229,7 @@ class RevampedArtControl {
}
}
- else
+ else
{
var artScaleFactor = 0.804354*Math.log(0.00577801*this.artSlave.boobs);
@@ -1314,7 +1314,7 @@ class RevampedArtControl {
if (this.showNipplesPiercings)
{
var size = "Small";
-
+
if (this.artSlave.boobs < 600)
{
size = "Small";
@@ -1331,7 +1331,7 @@ class RevampedArtControl {
{
if (this.artSlave.boobs < 300)
result.push("Art_Vector_Revamp_Boob_None_Piercing");
- else
+ else
result.push("Art_Vector_Revamp_Boob_" + size + "_Piercing");
}
else if (this.artSlave.nipplesPiercing == 2)
@@ -1346,7 +1346,7 @@ class RevampedArtControl {
{
if (this.artSlave.boobs < 300)
result.push("Art_Vector_Revamp_Boob_None_Areola_Piercing");
- else
+ else
result.push("Art_Vector_Revamp_Boob_" + size + "_Areola_Piercing");
}
else if (this.artSlave.areolaePiercing == 2)
@@ -1428,7 +1428,7 @@ class RevampedArtControl {
break;
case "neck corset":
result.push("Art_Vector_Revamp_Collar_Neck_Corset");
- break;
+ break;
case "pretty jewelry":
result.push("Art_Vector_Revamp_Collar_Pretty_Jewelry");
break;
@@ -1446,10 +1446,10 @@ class RevampedArtControl {
break;
case "stylish leather":
result.push("Art_Vector_Revamp_Collar_Stylish_Leather");
- break;
+ break;
case "tight steel":
result.push("Art_Vector_Revamp_Collar_Tight_Steel");
- break;
+ break;
default:
}
@@ -1524,7 +1524,7 @@ class RevampedArtControl {
result.push("Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing_Heavy");
}
}
- else
+ else
{
result.push("Art_Vector_Revamp_Eyes_Angry");
result.push("Art_Vector_Revamp_Eyes_Angry_Highlights");
@@ -1573,7 +1573,7 @@ class RevampedArtControl {
result.push("Art_Vector_Revamp_Head_Mouth_Happy_Piercing_Heavy");
}
}
- else
+ else
{
result.push("Art_Vector_Revamp_Makeup_Mouth_Angry_" + lipsSize);
result.push("Art_Vector_Revamp_Mouth_Angry_" + lipsSize);
@@ -1667,7 +1667,7 @@ class RevampedArtControl {
case "dreadlocks":
result.push("Art_Vector_Revamp_Hair_Fore_Dreadlocks");
break;
- default:
+ default:
result.push("Art_Vector_Revamp_Hair_Fore_Messy");
}
@@ -1694,7 +1694,7 @@ class RevampedArtControl {
Array.prototype.push.apply(layers, this.chastityBeltLayer);
Array.prototype.push.apply(layers, this.torsoOutfitLayer);
Array.prototype.push.apply(layers, this.ballsLayer);
- Array.prototype.push.apply(layers, this.bellyLayer);
+ Array.prototype.push.apply(layers, this.bellyLayer);
Array.prototype.push.apply(layers, this.penisLayer);
Array.prototype.push.apply(layers, this.boobLayer);
Array.prototype.push.apply(layers, this.boobAddonLayer);
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index d52fc6371c6..d32ec9fef18 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -730,8 +730,8 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<if ($seeImages == 1) && ($imageChoice == 1)>>
/* prepare display of currently selected color. */
/* TODO: update currently selected color upon outfit select */
- /* _clothingBaseColor is set by display (Art_Vector_Set_Color_Shoe_), but not all outfits define a color. */
- /* _skinColor is used as fallback default (set by Art_Vector_Set_Color_Skin_). */
+ /* _clothingBaseColor is set by display (Art_Vector_Set_Colour_Shoe_), but not all outfits define a color. */
+ /* _skinColor is used as fallback default (set by Art_Vector_Set_Colour_Skin_). */
<<set _clothingBaseColor = _skinColor >>
<<if def _outfitBaseColor>>
/* set default color predefined by choice of outfit */
@@ -895,7 +895,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<if ($seeImages == 1) && ($imageChoice == 1)>>
/* prepare display of currently selected color. */
- /* _glassesColor is always set by display (Art_Vector_Set_Color_Outfit_) */
+ /* _glassesColor is always set by display (Art_Vector_Set_Colour_Outfit_) */
<<if def $activeSlave.glassesColor>>
/* regard current user selection */
<<set _glassesColor = $activeSlave.glassesColor>>
@@ -957,7 +957,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<if ($seeImages == 1) && ($imageChoice == 1)>>
/* prepare display of currently selected color. */
- /* _shoeColor is always set by display (Art_Vector_Set_Color_Shoe_) */
+ /* _shoeColor is always set by display (Art_Vector_Set_Colour_Shoe_) */
/* TODO: update currently selected color upon shoe select */
<<if def $activeSlave.shoeColor>>
/* regard current user selection */
--
GitLab