fixing interaction between enemytype and virginity

game/base-combat/end.twee

@@ -77,12 +77,12 @@
 			<span class="brat">It's nice to be in control.</span>
 			<br>
 		<</if>>
-	<<set $assertive to 0>>
+		<<set $assertive to 0>>
 	<</if>>
 
 <</if>>
 
-
+<<unset $enemytype>>
 
 <<endevent>>
 <<struggle_end>>
@@ -251,11 +251,11 @@
 <<set $feettarget to 0>>
 <<set $mouthtarget to 0>>
 <<if $player.penisExist>>
-<<set $penistarget to 0>>
+	<<set $penistarget to 0>>
 <</if>>
 <<if $player.vaginaExist>>
-<<set $vaginatarget to 0>>
-<<unset $vaginadoubletarget>>
+	<<set $vaginatarget to 0>>
+	<<unset $vaginadoubletarget>>
 <</if>>
 <<set $anustarget to 0>>
 <<unset $anusdoubletarget>>

game/base-combat/widgets.twee

@@ -135,7 +135,7 @@
 	<</if>>
 
 	<<set $_vType to $args[1]>>
-	<<if $_npc and $_vType and (!$wraith or $wraith.mimic isnot $_npc.nam) and $enemytype isnot "beast" and $enemytype isnot "tentacle">>
+	<<if $_npc and $_vType and (!$wraith or $wraith.mimic isnot $_npc.nam) and ($combat is 0 or ($enemytype isnot "beast" and $enemytype isnot "tentacle"))>>
 		<<if $_npc.virginity[$_vType] is true>>
 			<<set $_npc.virginity[$_vType] to "player">>
 			<<switch $_vType>>