From 13b87de9c15589da254e600531f2faf4d634a791 Mon Sep 17 00:00:00 2001
From: Braymann <19001-Braymann@users.noreply.gitgud.io>
Date: Thu, 23 Dec 2021 22:26:15 +0000
Subject: [PATCH] Bug fixes
---
game/04-Variables/canvasmodel-00-data.js | 1 +
game/04-Variables/canvasmodel-main.js | 2 +-
game/base-clothing/images.twee | 16 ++++------------
game/base-combat/missionary-images.twee | 4 ++--
.../tentacles/tentacle-images.twee | 2 +-
.../missionary/tentacles/tentaclefootjob.png | Bin 1094 -> 332 bytes
.../tentacles/tentaclehandjobleft.png | Bin 1004 -> 1611 bytes
.../tentacles/tentaclehandjobright.png | Bin 1002 -> 1593 bytes
8 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/game/04-Variables/canvasmodel-00-data.js b/game/04-Variables/canvasmodel-00-data.js
index b29b00b9bf..f889360f5e 100644
--- a/game/04-Variables/canvasmodel-00-data.js
+++ b/game/04-Variables/canvasmodel-00-data.js
@@ -21,6 +21,7 @@ window.ZIndices = {
armsidle: 30,
handsidle: 31.5,
breasts: 35,
+ breastsparasite: 36,
tanbreasts: 30,
blush: 50,
freckles: 51,
diff --git a/game/04-Variables/canvasmodel-main.js b/game/04-Variables/canvasmodel-main.js
index 7375d40f3f..8173875803 100644
--- a/game/04-Variables/canvasmodel-main.js
+++ b/game/04-Variables/canvasmodel-main.js
@@ -668,7 +668,7 @@ Renderer.CanvasModels["main"] = {
showfn(options) {
return !!options.nipples_parasite;
},
- z: ZIndices.breasts,
+ z: ZIndices.breastsparasite,
animation: "idle"
},
"leftarm": {
diff --git a/game/base-clothing/images.twee b/game/base-clothing/images.twee
index a6386fbd9c..ff5aebd86b 100644
--- a/game/base-clothing/images.twee
+++ b/game/base-clothing/images.twee
@@ -1828,8 +1828,6 @@
<<if $feetuse is "penis" or $feetstate is "tentacle">>
<<set _feet_pos to "_feetjob">>
-<<elseif $penisuse is "othervagina" or $penisuse is "otheranus">>
- <<set _feet_pos to "_left">>
<<elseif _leg_position is "up">>
<<set _feet_pos to "_up">>
<<else>>
@@ -1882,7 +1880,7 @@
<<if $worn.lower.state is "waist">>
<<if $worn.lower.skirt_down is 1>>
<<if $anususe is "penis" or _leg_position is "up">>
- <img class="layer-sexlower colour-lower anim-idle-2f" src="img/sex/missionary/idle/skirt/waist.png" @style="($worn.lower.colour is 'custom'? $worn.lower.colourCustom + _lowerOpacity : '')">
+ <img class="layer-sexlower colour-lower anim-idle-2f" src="img/sex/missionary/idle/skirt/hips.png" @style="($worn.lower.colour is 'custom'? $worn.lower.colourCustom + _lowerOpacity : '')">
<<else>>
<img class="layer-sexlower colour-lower anim-idle-2f" src="img/sex/missionary/idle/skirt/down.png" @style="($worn.lower.colour is 'custom'? $worn.lower.colourCustom + _lowerOpacity : '')">
<</if>>
@@ -2289,10 +2287,8 @@
<<set _feet_pos to "_feetjob">>
<<elseif $penisuse is "othervagina" or $penisuse is "otheranus">>
<<set _feet_pos to "_left">>
-<<elseif _leg_position is "up">>
- <<set _feet_pos to "_up">>
<<else>>
- <<set _feet_pos to "_down">>
+ <<set _feet_pos to "_up">>
<</if>>
<<if $worn.lower.name is "micro pleated skirt">>
@@ -2334,11 +2330,7 @@
<<elseif !$worn.lower.type.includes("naked") and $worn.upper.set isnot $worn.lower.set and setup.clothes.lower[clothesIndex('lower', $worn.lower)].skirt is 1>>
<<if setup.clothes.lower[clothesIndex('lower', $worn.lower)].short is 1>>
<<if $worn.lower.state is "waist">>
- <<if $worn.lower.skirt_down is 1>>
- <img @class="'layer-sexlower colour-lower anim-doggy-4f-'+_animspeed" src="img/sex/missionary/active/skirt/waist.png" @style="($worn.lower.colour is 'custom'? $worn.lower.colourCustom + _lowerOpacity : '')">
- <<elseif $worn.lower.skirt_down is 0>>
- <img @class="'layer-sexlower colour-lower anim-doggy-4f-'+_animspeed" src="img/sex/missionary/active/skirt/hips.png" @style="($worn.lower.colour is 'custom'? $worn.lower.colourCustom + _lowerOpacity : '')">
- <</if>>
+ <img @class="'layer-sexlower colour-lower anim-doggy-4f-'+_animspeed" src="img/sex/missionary/active/skirt/hips.png" @style="($worn.lower.colour is 'custom'? $worn.lower.colourCustom + _lowerOpacity : '')">
<<elseif $worn.lower.state is "midriff">>
<img @class="'layer-sexlower colour-lower anim-doggy-4f-'+_animspeed" src="img/sex/missionary/active/skirt/tummy.png" @style="($worn.lower.colour is 'custom'? $worn.lower.colourCustom + _lowerOpacity : '')">
<<elseif $worn.lower.state is "chest">>
@@ -2484,7 +2476,7 @@
<<set _legl to 'legl'>>
<<set _legr to 'feetjob'>>
<<else>>
- <<set _legl to (($penisuse is "othervagina" or $penisuse is "otheranus") ? 'legldown' : 'legl')>>
+ <<set _legl to 'legl'>>
<<set _legr to (($penisuse is "othervagina" or $penisuse is "otheranus") ? 'legrdown' : 'legr')>>
<</if>>
<<if $worn.feet.colour>>
diff --git a/game/base-combat/missionary-images.twee b/game/base-combat/missionary-images.twee
index 4406a3f852..6d81f538e2 100644
--- a/game/base-combat/missionary-images.twee
+++ b/game/base-combat/missionary-images.twee
@@ -756,9 +756,9 @@ Same as above, but with eyelashes.
<<elseif $penisstate is "penetrated" or $penisstate is "otheranus">>
<<if $enemytype isnot "beast" or $monster is 1>>
<<if $player.virginity.penile is true>>
- <img @class="'layer-sexlashes anim-doggy-4f-'+_animspeed" @src="_img.activepenisvirgindown" @style="'filter: '+_filters.body">
+ <img @class="'layer-frontforeground anim-doggy-4f-'+_animspeed" @src="_img.activepenisvirgindown" @style="'filter: '+_filters.body">
<<else>>
- <img @class="'layer-sexlashes anim-doggy-4f-'+_animspeed" @src="_img.activepenisdown" @style="'filter: '+_filters.body">
+ <img @class="'layer-frontforeground anim-doggy-4f-'+_animspeed" @src="_img.activepenisdown" @style="'filter: '+_filters.body">
<</if>>
<</if>>
<<elseif $player.virginity.penile is true>>
diff --git a/game/base-combat/tentacles/tentacle-images.twee b/game/base-combat/tentacles/tentacle-images.twee
index bf48c24b28..e4856790b1 100644
--- a/game/base-combat/tentacles/tentacle-images.twee
+++ b/game/base-combat/tentacles/tentacle-images.twee
@@ -156,7 +156,7 @@
<</if>>
<<if $feetstate is "tentacle">>
<img @class="'layer-sextears '+_tentacleColour+' anim-doggy-4f-'+_animspeed" src="img/sex/missionary/tentacles/tentaclefootjob.png">
- <img @class="'layer-sexbase anim-doggy-4f-'+_animspeed" @src="_img.activefeetjob" @style="'filter: '+_filters.body">
+ <img @class="'layer-sexrightleg anim-doggy-4f-'+_animspeed" @src="_img.activefeetjob" @style="'filter: '+_filters.body">
<</if>>
<<if $chestuse is "tentacle">>
<img @class="'layer-sexpenis '+_tentacleColour+' anim-doggy-4f-'+_animspeed" src="img/sex/missionary/tentacles/tentaclebreasts.png">
diff --git a/img/sex/missionary/tentacles/tentaclefootjob.png b/img/sex/missionary/tentacles/tentaclefootjob.png
index f030dfa5fe19583473d95ac499116d3244cf5432..39b389648a8cec39bdb3a09e1e83d859145b849b 100644
GIT binary patch
delta 265
zcmV+k0rvjJ2+RVI7-9kg0000`OYFA*000b7OjJc*W@%XfU4#IMwE(<kRFYEw0004W
zQchC<K<3zH0002)Nkl<Zc-rmOy$-@46b4Y1E?s=JE_ZS9=~!5NKNh9cn&?)V_!G|=
zT9(@jUm!Fkk?|LQfNwQK2%yuW@`EAnZ+*PfNdP^Kr{P@VrhQ}UG=^!2CmsFQ)_wKu
z1M|WoN90KWo1JPJBTC8ZV{3gH%c9<2Z|;AnC5^2v%A8`}evtk?fVO>ZTd<U_Ett~I
zBhdP<t(QskEa2Em=fZg)fFJyi+I<bT2=h7+z+Y;2;Y*eQ0+I0~7vNp4l+vyx-AL|K
P00000NkvXXu0mjfo0WHp
literal 1094
zcmeAS@N?(olHy`uVBq!ia0y~yU;#228CaNs)O~JAaUjK#?&#~tz_78O`%fY(kgt&J
z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2iUB?$u0VQbg!jYE
zi~nEV{O`f3|L-0}GQ|FWda0SAV++IX|NsB@ed7lyW-JNv3ubV5b|VeMN%D4g;mWx1
zB@D=6FY)wsWq-;h$6_w&wl8!m0|T?Dr;B4q#jUruE*3s=5MT*dzCdJ3Q&0hySEGnW
zqsWPG0!|T=HWpsx{3`bQ-t_+Y?{3Z&lDL1I9cUQw;Dh`u$E7c&jyzs%|F5KZS?2C_
z+0Lw+UOqMXamI85gQ`h~?g5Ls>*-u6mrrMYxcU9Olnh&bIYX*U{XWM$##!G!XPx*T
z_Q3JUHq%+(EGp*g>yCe3fAI>x)R)@-Pk8v2fBso>YhMfNifYDXKl@KJ9p2+>oHCEk
zJGr;F>dw3W6*2wwzW>kKeO|x(o?U&;1^;Di$tNy6NVb|_SO*Nr+l&zn<?#)!zrq_2
zr`}nXyKd(4gNc7HyS;pTb^Y=EPxxOJKfk*FUedq$(sSA?*QXogK6urB{aAEEl~}^e
zI{kvmKU?np5v-VBd)hr=^Pc}VxpXeae;50Z^6%@Fc=e4}S#9<<ex3aP+o`yZVh`Sm
zKajKjt5>95P-%3wPVwfC=JQkP{zU(JZ8P)#!7I`8k8GCSk$Y#)!4HSxKCYMgJuQ#%
z5ch>G!By6E%2xGqd;f9G%BZUQXK(srUt#n<)~JR@(tFAn-$kDNQ7^QvUi{^;e7EwL
z1`nW;n&zNK+O|N-_0QMVG#$elh0OBUhQF6Te||1KMJWE|$LG>D-SfS+>^^hf1zGTq
zfW2Ku*_?g8OP)VJZ?2(wk7-H%g8S)rHa+6jn2;AxUc<<GiFe<l?>|ojU;Fa$=kxn4
z(G6VB^)nfjezNL1tZ>}bz`B7URmb5KXUqkrmisNb4!a!ga!;`TU%|*7Pzl0~Quzy(
zeC`+bxbN_Yb4ne9Sm*(!E9U!IHD3IA%&Oy1`&oPgL##>tx8)Nqm@mBf^D|KFD{EIJ
zch`TZuyn8?^O>~u6BxBH@P*XRhd**H`F#1Y_JwpfllUZxtWxto!@)<deFZblO#=$6
zmbgZgq$HN4S|t~y0x1R~10zFS12bJ?gAfA~D-$3x(>5@$GBEIde1RK9LvDUbW?Cg~
U4OaUywu3D8boFyt=akR{04^E5egFUf
diff --git a/img/sex/missionary/tentacles/tentaclehandjobleft.png b/img/sex/missionary/tentacles/tentaclehandjobleft.png
index 2871d2485359ef5228f3a902d522b706f4af7283..aed5edb115c616abf9c0867280ac5ccaf8bd34ea 100644
GIT binary patch
literal 1611
zcmeAS@N?(olHy`uVBq!ia0y~yU;#22893O0l&&g^3W!%6<nF|<?wrg^AcrO0(btiI
zVPik{pF~z5pR>RtvY3H^?=T269?xHq!oa}#z|+Msq$2L^9m9233<MYg4i_$Pn$y_F
zt-$hp!NNrkWfYEN3W&zAFWC^h#`Td!;U>RNagX<3IyG}{#imKee+vVR9R-6l1U?k_
z=P5IYe^lH1yZCqUrSD%#FTd}IdvxL?KSM#7f4(x%*#$|v*u<xnPrJA5`{5tDwUWm+
zgr~3EUg4x)_;r?ipX#-Xo4?dl{8id3bL`IfFUb=1%i|B<sEYk6<nC9;(6G6f3FLD<
zhwTd{?s1;I`t6x1&!V-hyj3qo-ipfq*b?{XmKLAvVY5YX&!27Hwr~2q<$tU;_B~rS
zdE@u>y~{&o9P757<o`V7)lRejOMfn4J>P1U_4?}P2005xkg?(k-}9H=nAv?lrTs^4
z+K(A_Ay0n=|Ek&kIQ%xJ*2~;|arW{0pL3?l%QlpL`c*$SZtbeihQ;se_2T*0KA*X}
zPRZZUf3?M-TNO=z0+QFi{~z|K-t)=F+}!oA^J?dAuI;<^Ui;nIwg2zjdVcWY^`AFi
zy;w2-Fek{~9Spncdyn`%m~rczx841SboK39inoO2f9y<;Iug8F`0Rhzz3bL~HZ0u#
zY+e7x@A_{U`fdBC9lNa6r(pm8%Cq#Br8~k`J-%f#{aLfvm3rx|Utd)^@XrAm+`zrz
zcey}uIfMMx#kZqt9?cZ{Xp^-!K>b~KNs;%pvPs@YjNfW}v|wamxc(TFvl(I<?$$Rn
zclhO<j8nHhV!ZZy#kXC03>Wy-L6W0jGz18Rz=DNS{xMB?<T3N6<*sOuVoz5;mvv4F
FO#plIF-!me
literal 1004
zcmeAS@N?(olHy`uVBq!ia0y~yU;#228CaNs)O~JAaUjK#?&#~tz_78O`%fY(kgt&J
z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2(g8jpu0VQbgm)xE
z?ElM~w=nE(X6SghdGWsor~d!{e{J`jD?n++k|4ie28U-i(m<RfZ+91twtG{nfE@M`
zPhVH|r)+X8=8|svLboz7Fdg)CaSW-r_4dx&(nSFxtN~FKx)+#qFEr`iV0!Cr@=<vb
z&y1;-DR=kQTlycXo;Rm8QSJ0PkatJ~4ZEUlUw>2g?d_pm$^Q=hE1&4VSoHh8bCVfQ
z|L5Ozf4;=ot+&zFmHB+=&Cgc8#};zG^2M&nexA(pKir~`>5A@wnwvStGp)A$JC}H^
ze*dRECEGXD)y-bE()Q2N%iOVX@3s}i-Y7c5|LuSB>}UU-m{<cErhfJhKkF>LEHmT%
z^LJ%p@^ZR1-@iO~H{<JP`?mY1O8!6icPB1w&-y>VXT1HrUy7gq*!q7Tz6#HNc3-Gx
zHhb;I7AB1Yw^%;2zObqLXte*;;e^E0zkm84{yh}>cUKYj?oTtOf0N(I@_qj#2S$;E
z<}#VK<mi9Xr##;ps(rh?{5kjU<=j6`YwN$YSD)j+*d@Ne`feBN>vHLTNw>wq{$2R@
zeF8|EIO_^&N5(~;1Vt3I<iQM}${)Aq`!8TPDy-q~k%cS3#&LGNtfJYU8FS{{|8IF<
z0fQ%(!T<D>i!XP3O!y}e!T|JW0RyYX?*Dn>tQxiQ68;nT7BFn(Hn`u?!Y#0uoBO@J
zyaVGZ@dU5`0yF+fuBid4l><76J)q$cqsW2^2G$j_4{C%b&6bzbcc`kX`ptAke8Cg_
zmXzb%6XwmoSND_Q`NxC)4R0zKFMYmzTVMWxkzE-hSHC^$i%X1$-ZwBUVSeI&;Llf;
zg+Jdv-W~IQcS*w=PLK294JC|vhcCxZpC@CV!o0-aq3T~N(~<p33%~qGX?Xnf$@2S*
ztR6Sr8MFHP*)m=-RL_`yZyyuTzYJUfwj?GihChz^8BTkT#&V>50cuq(ag8WRNi0dV
zN-jzTQVd20MuxfuX1c}(AqFN^CO~ASZD3$!VBr1u0ym0=-29Zxv`X9>toCJW2RY8u
L)z4*}Q$iB}_=$lJ
diff --git a/img/sex/missionary/tentacles/tentaclehandjobright.png b/img/sex/missionary/tentacles/tentaclehandjobright.png
index 5c73e02d663a21d2dbfa089bf86d1027edeebf77..0bbf162a92c1518450bf35e01402ddcc6a61ed6d 100644
GIT binary patch
literal 1593
zcmeAS@N?(olHy`uVBq!ia0y~yU;#22893O0l&&g^3W!%6<nF|<?wrg^AcrO0(btiI
zVPik{pF~z5pR>RtvY3H^?=T269?xHq!oa|K&eO#)q$2L^ZSTG-1_BHLhYJ&0Etq%j
zWN<3rGh1_`fX}VtvO-vati!@=Lsiwj$tC;V=i2CgwGh2M)kCkG5oqiv7+N9FaJix^
zn{h|S_NRa6-=5#RZ~F1w`;@;4xu?}IG;FS_%Lc}2gK)5Ef_Tx=*Rek@Y`uT#`a0g|
zaHj2D+3O!4-gv~SDlo2We*Dzyv9tf`*zfvQ{`2Zq@Aa$q9+@a9&+y>Q98hR9a0lpG
z%!uJU7p3j6_1`t2sq1E~C|R4TUwBuWPxNqdXN|0NzUBU8+1^<7+WYf&<rSq?=gB1I
z*&O__A-!^M+S<=CultKX$5>3eR`b;+p+gvCW&vZ_e?FzMXOFhuSFB@}vYXoPTl{Nh
zP35M?;`>d{{=K#(Y}KZn|L5yoy&v~$=k*^e7-XE!{cr!27Bp}Bx#}46^{aRO?TI}f
zscS!N*ZQz@Y58xe&+8*z{k8wP*Z$hx-~8{A=e*ee)%K9tv1j$qDj(RjS%4F_c*6Jh
z2}$Z3{Igq^U%MYsJ9T+ZR_f}h6>Y9IYpsvuXn!irn&-ck;rVlyHS;&VHm$E;X>sUI
z#i6Um(qEO{aJ&Df?b^>ZUytuR`9C@HZ1{O*gsJ_mJ$Ef*vX4jF99EJOWmwknRe0*t
zSv#k`mHNo@y8Ae%0>chDb&$UwFunQ5Y~UF(E&H0?%^>A@|F7-RW7r_?2a+2Fqagqf
cf&WuJiFZY5&5ZcIaU)33)78&qol`;+07s@7f&c&j
literal 1002
zcmeAS@N?(olHy`uVBq!ia0y~yU;#228CaNs)O~JAaUjK#?&#~tz_78O`%fY(kgt&J
z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2asfUeu0VQbgm)xE
z?7s)6wlM5&X6SghdGY^ukN#iY{Qv)d=d1U(0aY-T1o;IsI6S+N2I3@nySs3Hyt(uZ
zki%Z$>Fdh=lueGsT+(e{=vD>>rahi6jv*Dd-rl`fI6FXuB_OIo_W~0LtzeA`xGA_v
zNATeh7Q?7H<>&lOW?Z~0UADpFk>_QgS!4i*sa~Gv_VMMbe}3G}{QBI_!r$^rjZ9Cz
z**i5|Dvdvrf4i=d_1AOl3;Qcr^ETgJ`2Kg|w=j^xn}z?&xzqz1s<;jAI-kyz@n2eN
z=CjYz#Ck(vo#gS4M!z5Xw*9_s!*{2DjYazPzyB|O`}tcXfPwXf(f=ZDSugXxSjo1!
zikR~^*KZE*7T;WKc5Xj!e*W|?{~lf3aD2KQ|KFE$u7BIVw%)XU?<elt&)-jWU=&FR
zZhFa9BKv=O^#4`L($DX=-G5wj@0$EivGRZG&)>}be`I@utdK?nQ%<N~Y`NC{^r&Tj
z-kq>JJo~Bnl&S7zx9t_?I52AII}}%na9?|GRAX10{6B6NtJ-&aCnnZ_hQ}fcw*Bp&
z0JO(}G0SfO1DAlV!_)nLf3k1|R5G!yuxVrpnYX~_zs$l*FWWr=&T&l;@h@m#nzNXd
z!_VHO>E-%n(FNE3N&^l0z@7*sANaeaEC+?9hQlU?%g!D<7%nc~@Zq04qsW3=fB6F%
z^!_Ru{Fc<&Q*YP66e6ck!}^JJg)N8)bR+))hO2BE;g^F0QtB%9FueTv^6P8ffV^|h
zPcxr*vbSDHSWe%es;;V*@tAu4KE~GL+!N-_kBe`3R{3Z4`-X=fnU*|XeqB64Y{Bbu
zS9`@3Z0+~%V>nw=@!<I8!;e`#&ik*|cPRV)rGoL&=gY6TC)~BOjcfSw=gTjql<ofg
zQ01ck-AkEd5<qs4kf<Kif8u^SC;#1S?k&J9#GqQ@8c~vxSdwa$T$Bo=7>o>z40R36
ybd3!{3{0#{fXGbSz`)AD!29t9ZWIl<`6-!cmAExn?aSB>a+s&9pUXO@geCxk_jwoq
--
GitLab