Skip to content
Snippets Groups Projects
Commit 905cb155 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'JSification' into 'pregmod-master' 

NoX/Deepmurk vector art to JS Part 2

See merge request pregmodfan/fc-pregmod!3298
parents f5ecd9c1 0de7ad28
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/art/artJS.tw
+ 157
− 0
View file @ 905cb155
...@@ -1754,6 +1754,163 @@ window.ArtVectorAnalAccessories = function(slave) { ...@@ -1754,6 +1754,163 @@ window.ArtVectorAnalAccessories = function(slave) {
return r; return r;
}; };
window.ArtVectorArm = function(slave) {
const T = State.temporary;
let r = "";
/* Arms position switch courtesy of Nov-X */
/* Updated 2018-10-25 by Fr0g */
/* - changed arm calculation block position*/
/* - added brackets to make boolean logic run */
if (slave.amp === 1) {
T.leftArmType = "None";
T.rightArmType = "None";
r += Story.get("Art_Vector_Arm_Right_None").processText();
r += Story.get("Art_Vector_Arm_Left_None").processText();
} else { /* is not amputee or has limbs equipped so running arm calculation block */
if (slave.devotion > 50) {
T.leftArmType = "High";
T.rightArmType = "High";
} else if (slave.trust >= -20) {
if (slave.devotion < -20) {
T.leftArmType = "Rebel";
T.rightArmType = "Low";
} else if (slave.devotion <= 20) {
T.leftArmType = "Low";
T.rightArmType = "Low";
} else {
T.leftArmType = "Mid";
T.rightArmType = "High";
}
} else {
T.leftArmType = "Mid";
T.rightArmType = "Mid";
}
if (slave.amp === 0) {
r += Story.get(`Art_Vector_Arm_Right_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Left_${T.rightArmType}`).processText();
if (slave.muscles >= 6) {
if (T.leftArmType === "High")
r += Story.get("Art_Vector_Arm_Left_High_MLight").processText();
else if (T.leftArmType === "Mid")
r += Story.get("Art_Vector_Arm_Left_Mid_MLight").processText();
else if (T.leftArmType === "Low")
r += Story.get("Art_Vector_Arm_Left_Low_MLight").processText();
else if (T.leftArmType === "Rebel")
r += Story.get("Art_Vector_Arm_Left_Rebel_MLight").processText();
if (T.rightArmType === "High")
r += Story.get("Art_Vector_Arm_Right_High_MLight").processText();
else if (T.rightArmType === "Mid")
r += Story.get("Art_Vector_Arm_Right_Mid_MLight").processText();
else if (T.rightArmType === "Low")
r += Story.get("Art_Vector_Arm_Right_Low_MLight").processText();
}
} else if (slave.PLimb === 1 || slave.PLimb === 2) { /* slave is an amputee and has PLimbs equipped */
if (slave.amp === -1) {
r += Story.get(`Art_Vector_Arm_Right_ProstheticBasic_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Left_ProstheticBasic_${T.rightArmType}`).processText();
} else if (slave.amp === -2) {
r += Story.get(`Art_Vector_Arm_Right_ProstheticSexy_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Left_ProstheticSexy_${T.rightArmType}`).processText();
} else if (slave.amp === -3) {/* Reverting beauty limbs to regular SVG */
r += Story.get(`Art_Vector_Arm_Right_ProstheticBeauty_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Left_ProstheticBeauty_${T.rightArmType}`).processText();
} else if (slave.amp === -4) {
r += Story.get(`Art_Vector_Arm_Right_ProstheticCombat_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Left_ProstheticCombat_${T.rightArmType}`).processText();
} else if (slave.amp === -5) {
r += Story.get(`Art_Vector_Arm_Right_ProstheticSwiss_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Left_ProstheticSwiss_${T.rightArmType}`).processText();
}
}
}
/* shiny clothing */
if (State.variables.seeVectorArtHighlights === 1) {
if (slave.fuckdoll !== 0 || slave.clothes === "restrictive latex" || slave.clothes === "a latex catsuit" || slave.clothes === "body oil") {
/* only some arm positions have art (feel free to add more) */
if (T.leftArmType === "High")
r += Story.get("Art_Vector_Arm_Outfit_Shine_Left_High").processText();
else if (T.leftArmType === "Mid")
r += Story.get("Art_Vector_Arm_Outfit_Shine_Left_Mid").processText();
else if (T.leftArmType === "Low")
r += Story.get("Art_Vector_Arm_Outfit_Shine_Left_Low").processText();
}
}
/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statements) */
switch (slave.clothes) {
case "a biyelgee costume":
case "a burkini":
case "a button-up shirt":
case "a button-up shirt and panties":
case "a cheerleader outfit":
case "a dirndl":
case "a gothic lolita dress":
case "a hanbok":
case "a hijab and abaya":
case "a hijab and blouse":
case "a huipil":
case "a kimono":
case "a klan robe":
case "a long qipao":
case "a military uniform":
case "a mounty outfit":
case "a nice maid outfit":
case "a nice nurse outfit":
case "a police uniform":
case "a red army uniform":
case "a schoolgirl outfit":
case "a schutzstaffel uniform":
case "a slutty klan robe":
case "a slutty nurse outfit":
case "a slutty qipao":
case "a sweater":
case "a sweater and cutoffs":
case "a sweater and panties":
case "a t-shirt":
case "a t-shirt and jeans":
case "a t-shirt and panties":
case "a t-shirt and thong":
case "an oversized t-shirt":
case "an oversized t-shirt and boyshorts":
case "battlearmor":
case "battledress":
case "clubslut netting":
case "conservative clothing":
case "cutoffs and a t-shirt":
case "lederhosen":
case "nice business attire":
case "slutty business attire":
case "slutty jewelry":
case "sport shorts and a t-shirt":
case "Western clothing":
r += Story.get(`Art_Vector_Arm_Outfit_${clothing2artSuffix(slave.clothes)}_Right_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Outfit_${clothing2artSuffix(slave.clothes)}_Left_${T.leftArmType}`).processText();
break;
case "a slutty schutzstaffel uniform":
r += Story.get(`Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_${T.leftArmType}`).processText();
break;
case "a niqab and abaya":
case "a burqa":
r += Story.get(`Art_Vector_Arm_Outfit_HijabAndAbaya_Right_${T.rightArmType}`).processText();
r += Story.get(`Art_Vector_Arm_Outfit_HijabAndAbaya_Left_${T.leftArmType}`).processText();
break;
case "a slave gown":
/* only some arm positions have art (feel free to add more) */
if (T.leftArmType === "High")
r += Story.get("Art_Vector_Arm_Outfit_SlaveGown_Left_High").processText();
else if (T.leftArmType === "Mid")
r += Story.get("Art_Vector_Arm_Outfit_SlaveGown_Left_Mid").processText();
else if (T.leftArmType === "Low")
r += Story.get("Art_Vector_Arm_Outfit_SlaveGown_Left_Low").processText();
}
return r;
};
window.ArtVectorBoobAddons = function(slave) { window.ArtVectorBoobAddons = function(slave) {
let r = ""; let r = "";
......
src/art/vector/Arm.tw
+ 1
− 174
View file @ 905cb155
:: Art_Vector_Arm_ [nobr] :: Art_Vector_Arm_ [nobr]
/* Arms position switch courtesy of Nov-X */ <<= ArtVectorArm(_artSlave)>>
/* Updated 2018-10-25 by Fr0g */
/* - changed arm calculation block position*/
/* - added brackets to make boolean logic run */
<<if _artSlave.amp == 1>>
<<set _leftArmType = "None">>
<<set _rightArmType = "None">>
<<set _art = "Art_Vector_Arm_Right_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_"+_leftArmType >>
<<include _art>>
<<else>> /* not amputee so running arm calculation block */
<<if _artSlave.weight <= 20>>
<<if $args[0].devotion > 50>>
<<set _leftArmType = "High">>
<<set _rightArmType = "High">>
<<elseif $args[0].trust >= -20>>
<<if $args[0].devotion < -20>>
<<set _leftArmType = "Rebel">>
<<set _rightArmType = "Low">>
<<elseif $args[0].devotion <= 20>>
<<set _leftArmType = "Low">>
<<set _rightArmType = "Low">>
<<else>>
<<set _leftArmType = "Mid">>
<<set _rightArmType = "High">>
<</if>>
<<else>>
<<set _leftArmType = "Mid">>
<<set _rightArmType = "Mid">>
<</if>>
<<elseif _artSlave.weight > 20>>
<<if $args[0].devotion > 50>>
<<set _leftArmType = "High">>
<<set _rightArmType = "High">>
<<elseif $args[0].trust >= -20>>
<<if $args[0].devotion < -20>>
<<set _leftArmType = "Rebel">>
<<set _rightArmType = "Low">>
<<elseif $args[0].devotion <= 20>>
<<set _leftArmType = "Low">>
<<set _rightArmType = "Low">>
<<else>>
<<set _leftArmType = "Mid">>
<<set _rightArmType = "High">>
<</if>>
<<else>>
<<set _leftArmType = "Mid">>
<<set _rightArmType = "Mid">>
<</if>>
<</if>>
<</if>>
<<if _artSlave.amp == 0>>
<<set _art = "Art_Vector_Arm_Right_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_"+_leftArmType >>
<<include _art>>
<</if>>
<<if _artSlave.amp == 0>>
<<if _artSlave.muscles >= 6>>
<<if _leftArmType == "High">>
<<include Art_Vector_Arm_Left_High_MLight>>
<<elseif _leftArmType == "Mid">>
<<include Art_Vector_Arm_Left_Mid_MLight>>
<<elseif _leftArmType == "Low">>
<<include Art_Vector_Arm_Left_Low_MLight>>
<<elseif _leftArmType == "Rebel">>
<<include Art_Vector_Arm_Left_Rebel_MLight>>
<</if>>
<</if>>
<<if _artSlave.muscles >= 6>>
<<if _rightArmType == "High">>
<<include Art_Vector_Arm_Right_High_MLight>>
<<elseif _rightArmType == "Mid">>
<<include Art_Vector_Arm_Right_Mid_MLight>>
<<elseif _rightArmType == "Low">>
<<include Art_Vector_Arm_Right_Low_MLight>>
<</if>>
<</if>>
<</if>>
<<if _artSlave.amp == -1 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
<<set _art = "Art_Vector_Arm_Right_ProstheticBasic_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_ProstheticBasic_"+_leftArmType >>
<<include _art>>
<</if>>
<<if _artSlave.amp == -2 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
<<set _art = "Art_Vector_Arm_Right_ProstheticSexy_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_ProstheticSexy_"+_leftArmType >>
<<include _art>>
<</if>>
<<if _artSlave.amp == -3 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
/* Reverting beauty limbs to regular SVG */
<<set _art = "Art_Vector_Arm_Right_ProstheticBeauty_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_ProstheticBeauty_"+_leftArmType >>
<<include _art>>
<</if>>
<<if _artSlave.amp == -4 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
<<set _art = "Art_Vector_Arm_Right_ProstheticCombat_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_ProstheticCombat_"+_leftArmType >>
<<include _art>>
<</if>>
<<if _artSlave.amp == -5 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
<<set _art = "Art_Vector_Arm_Right_ProstheticSwiss_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_ProstheticSwiss_"+_leftArmType >>
<<include _art>>
<</if>>
/* shiny clothing */
<<if $seeVectorArtHighlights == 1>>
<<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">>
/* only some arm positions have art (feel free to add more) */
<<switch _leftArmType>>
<<case "High">>
<<include Art_Vector_Arm_Outfit_Shine_Left_High>>
<<case "Mid">>
<<include Art_Vector_Arm_Outfit_Shine_Left_Mid>>
<<case "Low">>
<<include Art_Vector_Arm_Outfit_Shine_Left_Low>>
<<default>>
/* no art for this arm position */
<</switch>>
<</if>>
<</if>>
/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statements) */
<<switch _artSlave.clothes>>
<<case "a hijab and abaya" "cutoffs and a t-shirt" "battledress" "conservative clothing" "a huipil" "a kimono" "a nice maid outfit" "a military uniform" "a nice nurse outfit" "a slutty nurse outfit" "a schoolgirl outfit" "Western clothing" "a slutty qipao" "nice business attire" "slutty business attire" "a schutzstaffel uniform" "a red army uniform" "slutty jewelry" "a cheerleader outfit" "clubslut netting" "battlearmor" "a dirndl" "a biyelgee costume" "lederhosen" "a mounty outfit" "a long qipao" "a klan robe" "a hijab and blouse" "a burkini" "a slutty klan robe" "a button-up shirt" "a button-up shirt and panties" "a t-shirt" "a t-shirt and panties" "a t-shirt and thong" "sport shorts and a t-shirt" "a t-shirt and jeans" "an oversized t-shirt" "an oversized t-shirt and boyshorts" "a sweater" "a sweater and cutoffs" "a sweater and panties" "a police uniform" "a hanbok" "a gothic lolita dress">>
<<set _rightArmArt = "Art_Vector_Arm_Outfit_" + clothing2artSuffix(_artSlave.clothes) + "_Right_" + _rightArmType>>
<<set _leftArmArt = "Art_Vector_Arm_Outfit_" + clothing2artSuffix(_artSlave.clothes) + "_Left_" + _leftArmType>>
<<include _rightArmArt>>
<<include _leftArmArt>>
<<case "a slutty schutzstaffel uniform">>
<<set _rightArmArt = "Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_" + _rightArmType>>
<<set _leftArmArt = "Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_" + _leftArmType>>
<<include _rightArmArt>>
<<include _leftArmArt>>
<<case "a niqab and abaya" "a burqa">>
<<set _rightArmArt = "Art_Vector_Arm_Outfit_HijabAndAbaya_Right_" + _rightArmType>>
<<set _leftArmArt = "Art_Vector_Arm_Outfit_HijabAndAbaya_Left_" + _leftArmType>>
<<include _rightArmArt>>
<<include _leftArmArt>>
<<case "a slave gown">>
/* only some arm positions have art (feel free to add more) */
<<switch _leftArmType>>
<<case "High">>
<<include Art_Vector_Arm_Outfit_SlaveGown_Left_High>>
<<case "Mid">>
<<include Art_Vector_Arm_Outfit_SlaveGown_Left_Mid>>
<<case "Low">>
<<include Art_Vector_Arm_Outfit_SlaveGown_Left_Low>>
<<default>>
/* no art for this arm position */
<</switch>>
<</switch>>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment