Merge branch 'animation_fix' into 'dev'

fix - "wide flaps" hair picture is broken in active doggy animation

See merge request !1903

game/base-combat/doggy-images.twee

@@ -500,23 +500,24 @@
 					<</if>>
 				<</if>>
 			<</if>>
-
+			
 			<<if ["buzzcut", "mohawk", "wide flaps"].includes($fringetype)>>
-				<<set _fringeType to $fringetype.replace(" ", "_")>>
+				<<set _fringetype to $fringetype.replace(" ", "_")>>
 				/* Sprites designed to reflect fringe length */
 				<<if $fringelength gte 900>>
-					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + $fringetype + '/doggyactivefeet.png'">
+					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + _fringetype + '/doggyactivefeet.png'">
 				<<elseif $fringelength gte 700>>
-					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + $fringetype + '/doggyactivethighs.png'">
+					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + _fringetype + '/doggyactivethighs.png'">
 				<<elseif $fringelength gte 600>>
-					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + $fringetype + '/doggyactivenavel.png'">
+					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + _fringetype + '/doggyactivenavel.png'">
 				<<elseif $fringelength gte 400>>
-					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + $fringetype + '/doggyactivechest.png'">
+					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + _fringetype + '/doggyactivechest.png'">
 				<<elseif $fringelength gte 200>>
-					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + $fringetype + '/doggyactiveshoulder.png'">
+					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + _fringetype + '/doggyactiveshoulder.png'">
 				<<else>>
-					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + $fringetype + '/doggyactiveshort.png'">
+					<img class="layer-sexhair colour-hair anim-idle-2f" @src="'img/sex/doggy/active/hair/' + _fringetype + '/doggyactiveshort.png'">
 				<</if>>
+				<<unset _fringetype>>
 			<<elseif $hairtype is "short">>
 				<img class="layer-sexhair colour-hair anim-idle-2f" src="img/sex/doggy/active/hair/short/doggyactiveshort.png">
 			<<elseif ["curtain", "hime"].includes($fringetype)>>
@@ -1270,4 +1271,4 @@
 			<img @class="'layer-sexbase anim-doggy-4f-'+_animspeed" @src="_img.doggyactivepushlight" @style="'filter: '+_filters.body">
 		</div>
 	<</if>>
-<</widget>>
\ No newline at end of file
+<</widget>>