Browse Source

[changed] arrays for the new piercing & tattoo images, reordered ARGS in pirsingsalon and lover_change a little bit so they're in the same order as the image folders, [fixed] a small bug in gopskver regarding piercings

Sicaa 4 years ago
parent
commit
bfd4c52276
3 changed files with 79 additions and 79 deletions
  1. 1 1
      locations/gopskver.qsrc
  2. 20 20
      locations/lover_change.qsrc
  3. 58 58
      locations/pirsingsalon.qsrc

+ 1 - 1
locations/gopskver.qsrc

@@ -822,7 +822,7 @@ if $ARGS[0] = 'BjBeerVag':
 	else
 		'Dan runs his hand over your bald pussy, and chuckles with satisfaction: "Very nice, <<$pcs_nickname>>. You got it all nice and smooth for us, so we can see what we''re fucking next."'
 	end
-	if pirsG = 1:
+	if pirsG > 0:
 		pcs_horny += 10
 		'The guys are intrigued by your intimate piercing, and playfully rub and tug at it, making you blush and moan with excitement.'
 	end

+ 20 - 20
locations/lover_change.qsrc

@@ -268,7 +268,7 @@ if $ARGS[0] = 'Pier':
 						elseif randchan = 6 and pirsF = 0:
 							if pirsF = 0 and pierCount < pierPrefTmpMin:
 								'He motions for you to lift up your shirt. After you do the man grabs your breasts rather softly and carefully pierces each nipple.'
-								!!'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
 								pcs_horny += 5
 								pirsF = 1
 								pirsF1_owned = 1
@@ -280,7 +280,7 @@ if $ARGS[0] = 'Pier':
 							if pirsG = 0 and pierCount < pierPrefTmpMin:
 								'"Ma ''am can you take off your bottoms?", the man says. You realize that he plans to pierce your labia and you reluctantly present yourself.'
 								'You cover your mouth as you let out a quick "Eep!", as you feel a quick pain through your labia, but in a second, its over.'
-								!!'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
 								pcs_horny += 7
 								pirsG = 1
 								pirsG1_owned = 1
@@ -520,7 +520,15 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your ankles.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle<<tatankle>>.jpg"></center>'
 						end
-					elseif randchan = 8 and tatleg = 0:
+					elseif randchan = 8 and tathand = 0:
+						randchan = rand(1,9)
+						if tathand = 0 and tattCount < tattPrefTmpMin:
+							tathand = randchan
+							tattCount += 1
+							'He gives you a tattoo on your hand.'
+							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
+						end
+					elseif randchan = 9 and tatleg = 0:
 						randchan = rand(1,47)
 						if tatleg = 0 and tattCount < tattPrefTmpMin:
 							tatleg = randchan
@@ -528,7 +536,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your legs.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/legs/tatleg<<tatleg>>.jpg"></center>'
 						end
-					elseif randchan = 9 and tatlip = 0:
+					elseif randchan = 10 and tatlip = 0:
 						randchan = rand(1,9)
 						if tatlip = 0 and tattCount < tattPrefTmpMin:
 							tatlip = randchan
@@ -536,7 +544,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your bottom lip.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg"></center>'
 						end
-					elseif randchan = 10 and tatneck = 0:
+					elseif randchan = 11 and tatneck = 0:
 						randchan = rand(1,30)
 						if tatneck = 0 and tattCount < tattPrefTmpMin:
 							tatneck = randchan
@@ -544,7 +552,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your neck.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/neck/tatnck<<tatneck>>.jpg"></center>'
 						end
-					elseif randchan = 11 and tatvag = 0:
+					elseif randchan = 12 and tatvag = 0:
 						randchan = rand(1,53)
 						if tatvag = 0 and tattCount < tattPrefTmpMin:
 							tatvag = randchan
@@ -552,7 +560,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo above your cunt.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag<<tatvag>>.jpg"></center>'
 						end
-					elseif randchan = 12 and tatlech = 0:
+					elseif randchan = 13 and tatlech = 0:
 						randchan = rand(1,25)
 						if tatlech = 0 and tattCount < tattPrefTmpMin:
 							tatlech = randchan
@@ -560,15 +568,15 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your shoulder.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr<<tatlech>>.jpg"></center>'
 						end
-					elseif randchan = 13 and tatside = 0:
-						randchan = rand(1,19)
+					elseif randchan = 14 and tatside = 0:
+						randchan = rand(1,23)
 						if tatside = 0 and tattCount < tattPrefTmpMin:
 							tatside = randchan
 							tattCount += 1
 							'He gives you a tattoo on your sides.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/side/tatside<<tatside>>.jpg"></center>'
 						end
-					elseif randchan = 14 and tatupb = 0:
+					elseif randchan = 15 and tatupb = 0:
 						randchan = rand(1,32)
 						if tatupb = 0 and tattCount < tattPrefTmpMin:
 							tatupb = randchan
@@ -576,7 +584,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tramp stamp.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck<<tatupb>>.jpg"></center>'
 						end
-					elseif randchan = 15 and tatunder = 0:
+					elseif randchan = 16 and tatunder = 0:
 						randchan = rand(1,22)
 						if tatunder = 0 and tattCount < tattPrefTmpMin:
 							tatunder = randchan
@@ -584,7 +592,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo under your breasts.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/underbreast/tatundbreast<<tatunder>>.jpg"></center>'
 						end
-					elseif randchan = 16 and tatwrist = 0:
+					elseif randchan = 17 and tatwrist = 0:
 						randchan = rand(1,51)
 						if tatwrist = 0 and tattCount < tattPrefTmpMin:
 							tatwrist = randchan
@@ -592,14 +600,6 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your wrists.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/wrists/tatwrst<<tatwrist>>.jpg"></center>'
 						end
-					elseif randchan = 17 and tathand = 0:
-						randchan = rand(1,9)
-						if tathand = 0 and tattCount < tattPrefTmpMin:
-							tathand = randchan
-							tattCount += 1
-							'He gives you a tattoo on your hand.'
-							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
-						end
 					elseif tattCount = 18:
 						''
 					else

+ 58 - 58
locations/pirsingsalon.qsrc

@@ -702,7 +702,7 @@ if $ARGS[0] = 'pirsvla':
 	:looppubic_pir
 		*p '<a href="exec:gt ''pirsingsalon'', ''pubic_pir'', <<i>>"><img src="images/pc/body/piercings/g<<i>>.jpg" 	height="250" /></a>'
 		i += 1
-	if i <= 7:jump 'looppubic_pir'
+	if i <= 10:jump 'looppubic_pir'
 
 	act 'Return':gt 'pirsingsalon', 'start'
 end
@@ -1133,7 +1133,7 @@ end
 if $ARGS[0] = 'face_get':
 	*clr
 	cla
-'<center><img src="images/pc/body/tattoos/face/tatfce<<n>>.jpg"></center>'
+	'<center><img src="images/pc/body/tattoos/face/tatfce<<n>>.jpg"></center>'
 
 	if (money < 10000) and (karta + bankDebtLimit < 10000):
 		'You cannot afford this tattoo.'
@@ -1220,6 +1220,61 @@ if $ARGS[0] = 'foot_get':
 	act 'Return': gt 'pirsingsalon', 'start'
 end
 
+if $ARGS[0] = 'hand':
+	*clr
+	cla
+	if tathand = 0:
+
+		n = 1
+		:looptathand
+		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''hand_get''"><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg" height="250" /></a>'
+		n += 1
+		if n <= 9:jump 'looptathand'
+		*nl
+
+	else
+		'<center><img src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
+		'You already have this tattoo here.'
+	end
+
+	act 'Return': gt 'pirsingsalon', 'start'
+end
+
+if $ARGS[0] = 'hand_get':
+	*clr
+	cla
+	'<center><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg"></center>'
+
+	if (money < 7000) and (karta + bankDebtLimit < 7000):
+		'You cannot afford this tattoo.'
+	else
+		if money >= 7000:
+			act 'Get this tattoo 7,000 <b>₽</b> (cash)':
+				cla
+				tathand = n
+				money -= 7000
+				minut += 60
+				gs 'stat'
+
+				act 'Return': gt 'pirsingsalon', 'start'
+			end
+		end
+		if karta + bankDebtLimit >= 7000:
+			act 'Get this tattoo 7,000 <b>₽</b> (card)':
+				cla
+				tathand = n
+				karta -= 7000
+				minut += 60
+				gs 'stat'
+
+				act 'Return': gt 'pirsingsalon', 'start'
+			end
+		end
+	end
+
+	act 'Return': gt 'pirsingsalon', 'start'
+end
+
 if $ARGS[0] = 'leg':
 	*clr
 	cla
@@ -1504,7 +1559,7 @@ if $ARGS[0] = 'side':
 		:looptatside
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''side_get''"><img src="images/pc/body/tattoos/side/tatside<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 19:jump 'looptatside'
+		if n <= 23:jump 'looptatside'
 		*nl
 
 	else
@@ -1715,60 +1770,5 @@ if $ARGS[0] = 'wrist_get':
 	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'hand':
-	*clr
-	cla
-	if tathand = 0:
-
-		n = 1
-		:looptathand
-		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''hand_get''"><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg" height="250" /></a>'
-		n += 1
-		if n <= 9:jump 'looptathand'
-		*nl
-
-	else
-		'<center><img src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
-		'You already have this tattoo here.'
-	end
-
-	act 'Return': gt 'pirsingsalon', 'start'
-end
-
-if $ARGS[0] = 'hand_get':
-	*clr
-	cla
-	'<center><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg"></center>'
-
-	if (money < 7000) and (karta + bankDebtLimit < 7000):
-		'You cannot afford this tattoo.'
-	else
-		if money >= 7000:
-			act 'Get this tattoo 7,000 <b>₽</b> (cash)':
-				cla
-				tathand = n
-				money -= 7000
-				minut += 60
-				gs 'stat'
-
-				act 'Return': gt 'pirsingsalon', 'start'
-			end
-		end
-		if karta + bankDebtLimit >= 7000:
-			act 'Get this tattoo 7,000 <b>₽</b> (card)':
-				cla
-				tathand = n
-				karta -= 7000
-				minut += 60
-				gs 'stat'
-
-				act 'Return': gt 'pirsingsalon', 'start'
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'start'
-end
-
 --- pirsingsalon ---------------------------------