Merge branch 'dp-image-fix' into 'dev'

fix for DP sprites

See merge request !2242

game/base-combat/images.twee

@@ -136,28 +136,28 @@
 						<<if $_target2 isnot undefined>>
 							<<if npcHasStrapon($_target2)>>
 								<<if $NPCList[$_target2].penisdesc.includes("horse")>>
-									<<set $_penetratorVSprite to "penisHorseRed">>
-									<<set $_penetratorVSize to 5>>
+									<<set $_penetratorV2Sprite to "penisHorseRed">>
+									<<set $_penetratorV2Size to 5>>
 								<<elseif $NPCList[$_target2].penisdesc.includes("knotted")>>
-									<<set $_penetratorVSprite to "penisKnotted">>
-									<<set $_penetratorVSize to 3>>
+									<<set $_penetratorV2Sprite to "penisKnotted">>
+									<<set $_penetratorV2Size to 3>>
 								<<elseif $NPCList[$_target2].penisdesc.includes("tentacle")>>
-									<<set $_penetratorVSprite to "tentacle">>
-									<<set $_penetratorVSize to $NPCList[$_target2].penissize>>
+									<<set $_penetratorV2Sprite to "tentacle">>
+									<<set $_penetratorV2Size to $NPCList[$_target2].penissize>>
 								<<elseif $NPCList[$_target2].penisdesc.includes("dolphin")>>
-									<<set $_penetratorVSprite to "penisPoint">>
-									<<set $_penetratorVSize to 2>>
+									<<set $_penetratorV2Sprite to "penisPoint">>
+									<<set $_penetratorV2Size to 2>>
 								<<else>>
-									<<set $_penetratorVSprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
-									<<set $_penetratorVSize to $NPCList[$_target2].penissize>>
+									<<set $_penetratorV2Sprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
+									<<set $_penetratorV2Size to $NPCList[$_target2].penissize>>
 								<</if>>
-								<<set $_penetratorVColour to ($options.tanImgEnabled ? "strapon-" + $NPCList[$_target2].strapon.color : "")>>
-								<<set $_penetratorVFilter to "">>
+								<<set $_penetratorV2Colour to ($options.tanImgEnabled ? "strapon-" + $NPCList[$_target2].strapon.color : "")>>
+								<<set $_penetratorV2Filter to "">>
 							<<else>>
-								<<set $_penetratorVSprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
-								<<set $_penetratorVColour to "">>
-								<<set $_penetratorVFilter to ($options.tanImgEnabled ? setup.npcSkinDefaults[$NPCList[$_target2].skincolour] : "")>>
-								<<set $_penetratorVSize to $NPCList[$_target2].penissize>>
+								<<set $_penetratorV2Sprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
+								<<set $_penetratorV2Colour to "">>
+								<<set $_penetratorV2Filter to ($options.tanImgEnabled ? setup.npcSkinDefaults[$NPCList[$_target2].skincolour] : "")>>
+								<<set $_penetratorV2Size to $NPCList[$_target2].penissize>>
 							<</if>>
 							<<if wearingCondom($_target2)>>
 								<<set $_penetratorV2Condom to wearingCondom($_target2)>>
@@ -334,28 +334,28 @@
 						<<if $_target4 isnot undefined>>
 							<<if npcHasStrapon($_target4)>>
 								<<if $NPCList[$_target4].penisdesc.includes("horse")>>
-									<<set $_penetratorASprite to "penisHorseRed">>
-									<<set $_penetratorASize to 5>>
+									<<set $_penetratorA2Sprite to "penisHorseRed">>
+									<<set $_penetratorA2Size to 5>>
 								<<elseif $NPCList[$_target4].penisdesc.includes("knotted")>>
-									<<set $_penetratorASprite to "penisKnotted">>
-									<<set $_penetratorASize to 3>>
+									<<set $_penetratorA2Sprite to "penisKnotted">>
+									<<set $_penetratorA2Size to 3>>
 								<<elseif $NPCList[$_target4].penisdesc.includes("tentacle")>>
-									<<set $_penetratorASprite to "tentacle">>
-									<<set $_penetratorASize to $NPCList[$_target4].penissize>>
+									<<set $_penetratorA2Sprite to "tentacle">>
+									<<set $_penetratorA2Size to $NPCList[$_target4].penissize>>
 								<<elseif $NPCList[$_target4].penisdesc.includes("dolphin")>>
-									<<set $_penetratorASprite to "penisPoint">>
-									<<set $_penetratorASize to 2>>
+									<<set $_penetratorA2Sprite to "penisPoint">>
+									<<set $_penetratorA2Size to 2>>
 								<<else>>
-									<<set $_penetratorASprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
-									<<set $_penetratorASize to $NPCList[$_target4].penissize>>
+									<<set $_penetratorA2Sprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
+									<<set $_penetratorA2Size to $NPCList[$_target4].penissize>>
 								<</if>>
-								<<set $_penetratorAColour to ($options.tanImgEnabled ? "strapon-" + $NPCList[$_target4].strapon.color : "")>>
-								<<set $_penetratorAFilter to "">>
+								<<set $_penetratorA2Colour to ($options.tanImgEnabled ? "strapon-" + $NPCList[$_target4].strapon.color : "")>>
+								<<set $_penetratorA2Filter to "">>
 							<<else>>
-								<<set $_penetratorASprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
-								<<set $_penetratorAColour to "">>
-								<<set $_penetratorAFilter to ($options.tanImgEnabled ? setup.npcSkinDefaults[$NPCList[$_target4].skincolour] : "")>>
-								<<set $_penetratorASize to $NPCList[$_target4].penissize>>
+								<<set $_penetratorA2Sprite to ($options.tanImgEnabled ? "penisRed" : "penisWhite")>>
+								<<set $_penetratorA2Colour to "">>
+								<<set $_penetratorA2Filter to ($options.tanImgEnabled ? setup.npcSkinDefaults[$NPCList[$_target4].skincolour] : "")>>
+								<<set $_penetratorA2Size to $NPCList[$_target4].penissize>>
 							<</if>>
 							<<if wearingCondom($_target4)>>
 								<<set $_penetratorA2Condom to wearingCondom($_target4)>>