diff --git a/src/art/vector/ArtVectorColor.js b/src/art/vector/ArtVectorColor.js index f7613a449ef38fa1d2cff96cc6c26ed98244da16..4becc3e941a59ff53ec54a085f9c13def8baaabd 100644 --- a/src/art/vector/ArtVectorColor.js +++ b/src/art/vector/ArtVectorColor.js @@ -29,7 +29,7 @@ window.ArtVectorColor = function(slave) { } function setSkinColor() { - let colorSlave = skinColorCatcher(slave); + const colorSlave = skinColorCatcher(slave); /* setting default values */ T.areolaStyle = colorSlave.areolaColor; @@ -366,14 +366,7 @@ window.ArtVectorColor = function(slave) { function setShoeColor() { /* BEWARE: _shoeColour is read by Wardrobe Use */ - - /* note: only heels use this shadow */ - T.shoeShadowColour = "#616a6b"; - - if (slave.shoes === "none") - T.shoeColour = "#595959"; - else - T.shoeColour = "#80808080"; + /* note: only heels use this _shoeShadowColour */ /* override color in case of full body latex outfit, or custom color*/ if (slave.clothes === "a Fuckdoll suit" || slave.clothes === "restrictive latex") { @@ -382,6 +375,12 @@ window.ArtVectorColor = function(slave) { } 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. */ + } else { + T.shoeShadowColour = "#616a6b"; + if (slave.shoes === "none") + T.shoeColour = "#595959"; + else + T.shoeColour = "#80808080"; } } }; diff --git a/src/cheats/mod_EditNeighborArcologyCheat.tw b/src/cheats/mod_EditNeighborArcologyCheat.tw index a1aa5ca1b1ef353586b3105d227f696f14901be6..546fe6f10ebad98ab355680cd51ea9564b75ecd0 100644 --- a/src/cheats/mod_EditNeighborArcologyCheat.tw +++ b/src/cheats/mod_EditNeighborArcologyCheat.tw @@ -17,7 +17,7 @@ <<set _seed.delete($arcologies[_eca].direction)>> /* remove directions already in use */ <</for>> <<set _govtypes = ["elected officials", "a committee", "an oligarchy", "an individual", "a corporation", "direct democracy"]>> - <<set $activeArcology = {name: "Arcology X-", direction: _seed.random(), government: _govtypes.random(), honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor:0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSRepopulationFocus: "unset", FSRestart: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>> + <<set $activeArcology = {name: "Arcology X-", direction: _seed.random(), government: _govtypes.random(), honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor:0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSAztecRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSRepopulationFocus: "unset", FSHedonisticDecadence: "unset", FSCummunism: "unset", FSIncestFetishist: "unset", FSRestart: "unset", embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>> <<if $arcologies.length < 4>> /* X-4 is reserved for player's arcology, so X-1 is available */ <<set $activeArcology.name += ($arcologies.length)>>