From a24f86e4e576f4d1b4bbb5ee13c4ca9200954403 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 19 Jan 2019 02:23:49 -0500
Subject: [PATCH] A fix and a tweak
---
src/art/artJS.tw | 8 ++-
src/art/vector/layers/Empathy_Belly_Huge.tw | 2 +-
src/art/vector/layers/Empathy_Belly_Large.tw | 2 +-
src/art/vector/layers/Empathy_Belly_Medium.tw | 2 +-
src/art/vector/layers/Empathy_Belly_Small.tw | 2 +-
src/uncategorized/main.tw | 61 +------------------
6 files changed, 12 insertions(+), 65 deletions(-)
diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index c4d59be70d3..83187d5eff5 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -1733,9 +1733,6 @@ window.skinColorCatcher = function (artSlave) {
};
window.VectorArt = (function (artSlave) {
- /* temp variables that will need to be changed in the art files:
- art_transform
- */
let V, T, slave;
let r;
let leftArmType, rightArmType, legSize, torsoSize, buttSize, penisSize, hairLength;
@@ -1746,6 +1743,10 @@ window.VectorArt = (function (artSlave) {
function VectorArt(artSlave) {
/* set constants */
V = State.variables, T = State.temporary, slave = artSlave;
+ /* reset/initialize some variables */
+ T.artTransformBelly = "";
+ T.artTransformBoobs = "";
+ T.art_transform = ""; /* in case other files are trying to use this, and expecting a string */
r = "";
setArmType();
@@ -1787,6 +1788,7 @@ window.VectorArt = (function (artSlave) {
ArtVectorCollar(); /* includes clavicle artwork */
ArtVectorHead(); /* glasses are drawn here */
ArtVectorHairFore();
+
return r;
}
diff --git a/src/art/vector/layers/Empathy_Belly_Huge.tw b/src/art/vector/layers/Empathy_Belly_Huge.tw
index 5ed06199169..1ac8a4dc756 100644
--- a/src/art/vector/layers/Empathy_Belly_Huge.tw
+++ b/src/art/vector/layers/Empathy_Belly_Huge.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Empathy_Belly_Huge [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_art_transform+'"id="g5437"><path d="m 276.92441,452.14442 c 26.23647,-1.90119 60.45795,-5.70358 78.45592,-53.7404 16.60375,-56.14857 -35.23545,-126.23924 -75.92099,-128.64741 -50.82524,7.85826 -78.32917,54.24738 -80.99084,122.81709 2.78842,39.29133 41.953,62.10565 78.45591,59.57072 z" class="shadow" id="path5431"/><path d="m 276.92441,452.14442 c 26.36322,0.12675 62.61264,-16.47701 78.45592,-53.7404 15.84328,-37.26339 -23.44805,-105.70635 -58.30327,-128.90091 -8.2385,-5.45008 -49.05078,-10.39319 -51.20547,0 -3.2954,14.70257 -56.90906,42.2065 -52.47294,122.69035 2.28143,44.10769 57.16255,59.82422 83.52576,59.95096 z" class="skin" id="path5433"/><path sodipodi:nodetypes="scscs" class="bellybutton" d="m 244.72767,404.34591 c 0.15825,2.16418 -0.79395,5.71491 -2.7487,5.85786 -1.95474,0.14293 -2.99549,-3.12004 -3.15375,-5.28422 -0.15825,-2.16418 0.84997,-5.51884 2.80472,-5.66179 1.95474,-0.14294 2.93947,2.92397 3.09773,5.08815 z" id="path5435"/></g></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_artTransformBelly+'"id="g5437"><path d="m 276.92441,452.14442 c 26.23647,-1.90119 60.45795,-5.70358 78.45592,-53.7404 16.60375,-56.14857 -35.23545,-126.23924 -75.92099,-128.64741 -50.82524,7.85826 -78.32917,54.24738 -80.99084,122.81709 2.78842,39.29133 41.953,62.10565 78.45591,59.57072 z" class="shadow" id="path5431"/><path d="m 276.92441,452.14442 c 26.36322,0.12675 62.61264,-16.47701 78.45592,-53.7404 15.84328,-37.26339 -23.44805,-105.70635 -58.30327,-128.90091 -8.2385,-5.45008 -49.05078,-10.39319 -51.20547,0 -3.2954,14.70257 -56.90906,42.2065 -52.47294,122.69035 2.28143,44.10769 57.16255,59.82422 83.52576,59.95096 z" class="skin" id="path5433"/><path sodipodi:nodetypes="scscs" class="bellybutton" d="m 244.72767,404.34591 c 0.15825,2.16418 -0.79395,5.71491 -2.7487,5.85786 -1.95474,0.14293 -2.99549,-3.12004 -3.15375,-5.28422 -0.15825,-2.16418 0.84997,-5.51884 2.80472,-5.66179 1.95474,-0.14294 2.93947,2.92397 3.09773,5.08815 z" id="path5435"/></g></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Empathy_Belly_Large.tw b/src/art/vector/layers/Empathy_Belly_Large.tw
index 14ec5a471fd..93755cbfbbb 100644
--- a/src/art/vector/layers/Empathy_Belly_Large.tw
+++ b/src/art/vector/layers/Empathy_Belly_Large.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Empathy_Belly_Large [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_art_transform+'"id="g5417"><path id="path5411" class="shadow" d="m 276.41794,444.38354 c 23.86367,-1.72925 54.99021,-5.18776 71.36045,-48.88018 15.10214,-51.07057 -32.04879,-114.82232 -69.05478,-117.0127 -46.22866,7.14757 -71.24517,49.34131 -73.66612,111.70966 2.53623,35.73787 38.15882,56.48889 71.36045,54.18322 z"/><path id="path5413" class="skin" d="m 276.41794,444.38354 c 23.97896,0.11528 56.95002,-14.98685 71.36045,-48.88018 14.41044,-33.89334 -21.32743,-96.1464 -53.03038,-117.24327 -7.49342,-4.95719 -44.61469,-9.45324 -46.57451,0 -2.99737,13.37288 -51.76227,38.38939 -47.72735,111.59438 2.0751,40.11864 51.99283,54.41379 75.97179,54.52907 z"/><path id="path5415" d="m 247.13303,400.90787 c 0.14394,1.96845 -0.72215,5.19806 -2.50011,5.32808 -1.77796,0.13 -2.72458,-2.83787 -2.86853,-4.80632 -0.14394,-1.96845 0.77311,-5.01973 2.55107,-5.14975 1.77795,-0.13001 2.67363,2.65954 2.81757,4.62799 z" class="bellybutton" sodipodi:nodetypes="scscs"/></g></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_artTransformBelly+'"id="g5417"><path id="path5411" class="shadow" d="m 276.41794,444.38354 c 23.86367,-1.72925 54.99021,-5.18776 71.36045,-48.88018 15.10214,-51.07057 -32.04879,-114.82232 -69.05478,-117.0127 -46.22866,7.14757 -71.24517,49.34131 -73.66612,111.70966 2.53623,35.73787 38.15882,56.48889 71.36045,54.18322 z"/><path id="path5413" class="skin" d="m 276.41794,444.38354 c 23.97896,0.11528 56.95002,-14.98685 71.36045,-48.88018 14.41044,-33.89334 -21.32743,-96.1464 -53.03038,-117.24327 -7.49342,-4.95719 -44.61469,-9.45324 -46.57451,0 -2.99737,13.37288 -51.76227,38.38939 -47.72735,111.59438 2.0751,40.11864 51.99283,54.41379 75.97179,54.52907 z"/><path id="path5415" d="m 247.13303,400.90787 c 0.14394,1.96845 -0.72215,5.19806 -2.50011,5.32808 -1.77796,0.13 -2.72458,-2.83787 -2.86853,-4.80632 -0.14394,-1.96845 0.77311,-5.01973 2.55107,-5.14975 1.77795,-0.13001 2.67363,2.65954 2.81757,4.62799 z" class="bellybutton" sodipodi:nodetypes="scscs"/></g></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Empathy_Belly_Medium.tw b/src/art/vector/layers/Empathy_Belly_Medium.tw
index 51785d0469e..7cbf2dd7867 100644
--- a/src/art/vector/layers/Empathy_Belly_Medium.tw
+++ b/src/art/vector/layers/Empathy_Belly_Medium.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Empathy_Belly_Medium [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_art_transform+'"id="g5427"><path d="m 275.60889,439.44532 c 22.28181,-1.61462 51.34504,-4.84387 66.63014,-45.64004 14.10105,-47.68522 -29.92436,-107.21103 -64.47731,-109.25622 -43.16428,6.67378 -66.52251,46.07061 -68.78298,104.30471 2.36811,33.36889 35.62937,52.74438 66.63015,50.59155 z" class="shadow" id="path5421"/><path d="m 275.60889,439.44532 c 22.38945,0.10764 53.17494,-13.99341 66.63014,-45.64004 13.4552,-31.64663 -19.91369,-89.77309 -49.51513,-109.4715 -6.9967,-4.62859 -41.6573,-8.82661 -43.4872,0 -2.79869,12.48643 -48.33108,35.84465 -44.56363,104.19707 1.93755,37.45927 48.54636,50.80683 70.93582,50.91447 z" class="skin" id="path5423"/><path sodipodi:nodetypes="scscs" class="bellybutton" d="m 248.2652,398.85154 c 0.1344,1.83797 -0.67428,4.8535 -2.33438,4.9749 -1.66011,0.12138 -2.54398,-2.64975 -2.67838,-4.48772 -0.13441,-1.83797 0.72185,-4.68699 2.38195,-4.80838 1.66011,-0.1214 2.49641,2.48323 2.63081,4.3212 z" id="path5425"/></g></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_artTransformBelly+'"id="g5427"><path d="m 275.60889,439.44532 c 22.28181,-1.61462 51.34504,-4.84387 66.63014,-45.64004 14.10105,-47.68522 -29.92436,-107.21103 -64.47731,-109.25622 -43.16428,6.67378 -66.52251,46.07061 -68.78298,104.30471 2.36811,33.36889 35.62937,52.74438 66.63015,50.59155 z" class="shadow" id="path5421"/><path d="m 275.60889,439.44532 c 22.38945,0.10764 53.17494,-13.99341 66.63014,-45.64004 13.4552,-31.64663 -19.91369,-89.77309 -49.51513,-109.4715 -6.9967,-4.62859 -41.6573,-8.82661 -43.4872,0 -2.79869,12.48643 -48.33108,35.84465 -44.56363,104.19707 1.93755,37.45927 48.54636,50.80683 70.93582,50.91447 z" class="skin" id="path5423"/><path sodipodi:nodetypes="scscs" class="bellybutton" d="m 248.2652,398.85154 c 0.1344,1.83797 -0.67428,4.8535 -2.33438,4.9749 -1.66011,0.12138 -2.54398,-2.64975 -2.67838,-4.48772 -0.13441,-1.83797 0.72185,-4.68699 2.38195,-4.80838 1.66011,-0.1214 2.49641,2.48323 2.63081,4.3212 z" id="path5425"/></g></svg></html>' >>
\ No newline at end of file
diff --git a/src/art/vector/layers/Empathy_Belly_Small.tw b/src/art/vector/layers/Empathy_Belly_Small.tw
index 965b52fc32a..63d18a7b70f 100644
--- a/src/art/vector/layers/Empathy_Belly_Small.tw
+++ b/src/art/vector/layers/Empathy_Belly_Small.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Empathy_Belly_Small [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_art_transform+'"id="g5407"><path d="m 274.8,433.8 c 20.7,-1.5 47.7,-4.5 61.9,-42.4 13.1,-44.3 -27.8,-99.6 -59.9,-101.5 -40.1,6.2 -61.8,42.8 -63.9,96.9 2.2,31 33.1,49 61.9,47 z" class="shadow" id="path5401"/><path d="m 274.8,433.8 c 20.8,0.1 49.4,-13 61.9,-42.4 12.5,-29.4 -18.5,-83.4 -46,-101.7 -6.5,-4.3 -38.7,-8.2 -40.4,0 -2.6,11.6 -44.9,33.3 -41.4,96.8 1.8,34.8 45.1,47.2 65.9,47.3 z" class="skin" id="path5403"/><path sodipodi:nodetypes="scscs" class="bellybutton" d="m 249.39747,396.08802 c 0.12486,1.70749 -0.62641,4.50894 -2.16866,4.62172 -1.54225,0.11277 -2.36338,-2.46164 -2.48824,-4.16913 -0.12486,-1.70749 0.67061,-4.35425 2.21286,-4.46703 1.54225,-0.11278 2.31918,2.30695 2.44404,4.01444 z" id="path5405"/></g></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_artTransformBelly+'"id="g5407"><path d="m 274.8,433.8 c 20.7,-1.5 47.7,-4.5 61.9,-42.4 13.1,-44.3 -27.8,-99.6 -59.9,-101.5 -40.1,6.2 -61.8,42.8 -63.9,96.9 2.2,31 33.1,49 61.9,47 z" class="shadow" id="path5401"/><path d="m 274.8,433.8 c 20.8,0.1 49.4,-13 61.9,-42.4 12.5,-29.4 -18.5,-83.4 -46,-101.7 -6.5,-4.3 -38.7,-8.2 -40.4,0 -2.6,11.6 -44.9,33.3 -41.4,96.8 1.8,34.8 45.1,47.2 65.9,47.3 z" class="skin" id="path5403"/><path sodipodi:nodetypes="scscs" class="bellybutton" d="m 249.39747,396.08802 c 0.12486,1.70749 -0.62641,4.50894 -2.16866,4.62172 -1.54225,0.11277 -2.36338,-2.46164 -2.48824,-4.16913 -0.12486,-1.70749 0.67061,-4.35425 2.21286,-4.46703 1.54225,-0.11278 2.31918,2.30695 2.44404,4.01444 z" id="path5405"/></g></svg></html>' >>
\ No newline at end of file
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index dfa689eff8f..91b6341e2a9 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -386,76 +386,21 @@ __''MAIN MENU''__ //[[Summary Options]]//
</div>
<br>
<div class="content">
- <<set $slaveAssignmentTab = "overview">>
- <<if def _HG>>
- ''__@@.pink;<<= SlaveFullName($HeadGirl)>>@@__'' is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.
- <span id="manageHG"><strong><<link "Manage Head Girl" "HG Select">><</link>></strong></span> @@.cyan;[H]@@
- <<set $showOneSlave = "Head Girl">>
- <<include "Slave Summary">>
- <<elseif (ndef _HG) && ($slaves.length > 1)>>
+ <<if (ndef _HG) && ($slaves.length > 1)>>
You have @@.red;not@@ selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one" "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<elseif (ndef _HG)>>
//You do not have enough slaves to keep a Head Girl//
<</if>>
<br>
- <<if def _RC>>
- <<setLocalPronouns $slaves[_RC]>>
- ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is working
- <<if $recruiterTarget != "other arcologies">>
- to recruit girls.
- <<else>>
- as a Sexual
- <<if $arcologies[0].influenceTarget == -1>>
- Ambassador, but @@.red;$he has no target to influence.@@
- <<else>>
- Ambassador to <<for $i = 0; $i < $arcologies.length; $i++>><<if $arcologies[$i].direction == $arcologies[0].influenceTarget>>$arcologies[$i].name<<break>><</if>><</for>>.
- <</if>>
- <</if>>
- <span id="manageRecruiter"><strong><<link "Manage Recruiter" "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
- <<set $showOneSlave = "recruit girls">>
- <<include "Slave Summary">>
- <<else>>
+ <<if ndef _RC>>
You have @@.red;not@@ selected a Recruiter.
<span id="manageRecruiter"><strong><<link "Select one" "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<</if>>
<<if ($dojo != 0)>>
<br>
- <<if def _BG>>
- ''__@@.pink;<<= SlaveFullName($Bodyguard)>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard" "BG Select">><</link>></strong></span> @@.cyan;[B]@@
- <<set $showOneSlave = "guard you">>
- <<include "Slave Summary">>
- <<else>>
+ <<if ndef _BG>>
You have @@.red;not@@ selected a Bodyguard. <span id="manageBG"><strong><<link "Select one" "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<</if>>
-
- /* Start Italic event text */
- <<if (def _BG) && ($slaves[_BG].assignment == "guard you")>>
- <<setLocalPronouns $slaves[_BG]>>
- <<set $i = _BG>>
- <<set _GO = "idiot ball">>
- <br><<include "Use Guard">>
- <br> [["Use "+$his+" mouth"|FLips][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
- | [["Play with "+$his+" tits"|FBoobs][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
- <<if canDoVaginal($slaves[_BG])>>
- | [["Fuck "+$him|FVagina][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
- <<if canDoAnal($slaves[_BG])>>
- | [["Use "+$his+" holes"|FButt][$activeSlave = $slaves[_BG],$nextButton = _j, $nextLink = _k, $returnTo = _l]]
- <</if>>
- <<if $slaves[_BG].belly >= 300000>>
- | [["Fuck "+$him+" over "+$his+" belly"|FBellyFuck][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
- <</if>>
- <</if>>
- /*check*/
- <<if canPenetrate($slaves[_BG])>>
- | [["Ride "+$him|FDick][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
- <</if>>
- <<if canDoAnal($slaves[_BG])>>
- | [["Fuck "+$his+" ass"|FAnus][$activeSlave = $slaves[_BG], $nextButton = _j, $nextLink = _k, $returnTo = _l]]
- <</if>>
- | [["Abuse "+$him|Gameover][$gameover = _GO]]
- <</if>>
- /* End Italic event text */
-
<</if>>
</div>
</div>
--
GitLab